mirror of
https://github.com/samba-team/samba.git
synced 2025-03-05 20:58:40 +03:00
smbd/notify_hash.c: Merged Herb's fix.
lib/debug.c: Fix for potential null pointer access. Jeremy. (This used to be commit 5a4d22dd66ab782f6161aa5a4162c0e7f1d811fb)
This commit is contained in:
parent
d04824639d
commit
b947ad3a49
@ -365,7 +365,8 @@ BOOL reopen_logs( void )
|
||||
log_overflow = True;
|
||||
DEBUG(0, ("Unable to open new log file %s: %s\n", debugf, strerror(errno)));
|
||||
log_overflow = False;
|
||||
x_fflush(dbf);
|
||||
if (dbf)
|
||||
x_fflush(dbf);
|
||||
ret = False;
|
||||
} else {
|
||||
x_setbuf(new_dbf, NULL);
|
||||
|
@ -116,7 +116,7 @@ static BOOL notify_hash(connection_struct *conn, char *path, uint32 flags,
|
||||
if (flags & (FILE_NOTIFY_CHANGE_DIR_NAME|FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_FILE)) {
|
||||
int i;
|
||||
unsigned char tmp_hash[16];
|
||||
mdfour(tmp_hash, (const unsigned char *)fname, strlen(fname));
|
||||
mdfour(tmp_hash, (unsigned char *)fname, strlen(fname));
|
||||
for (i=0;i<16;i++)
|
||||
data->name_hash[i] ^= tmp_hash[i];
|
||||
}
|
||||
@ -195,7 +195,7 @@ static BOOL hash_check_notify(connection_struct *conn, uint16 vuid, char *path,
|
||||
|
||||
static void hash_remove_notify(void *datap)
|
||||
{
|
||||
SAFE_FREE(datap);
|
||||
free(datap);
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
|
Loading…
x
Reference in New Issue
Block a user