git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b03ad70
)
s3: Fix crash in free_file_list().
author
Bo Yang
<boyang@samba.org>
Mon, 30 Nov 2009 09:30:25 +0000
(17:30 +0800)
committer
Bo Yang
<boyang@samba.org>
Mon, 30 Nov 2009 11:22:47 +0000
(19:22 +0800)
Signed-off-by: Bo Yang <boyang@samba.org>
source3/param/loadparm.c
patch
|
blob
|
history
diff --git
a/source3/param/loadparm.c
b/source3/param/loadparm.c
index 29e3a2509f382cc40478ed60c283620071e2cf02..a1f5328763416ca26ac95c5735b8bcfbd294ffed 100644
(file)
--- a/
source3/param/loadparm.c
+++ b/
source3/param/loadparm.c
@@
-7016,6
+7016,7
@@
static void add_to_file_list(const char *fname, const char *subfname)
}
f->subfname = SMB_STRDUP(subfname);
if (!f->subfname) {
+ SAFE_FREE(f->name);
SAFE_FREE(f);
return;
}
@@
-7026,6
+7027,7
@@
static void add_to_file_list(const char *fname, const char *subfname)
if (t)
f->modtime = t;
}
+ return;
}
/**
@@
-7113,9
+7115,8
@@
bool lp_file_list_changed(void)
ctime(&mod_time)));
f->modtime = mod_time;
SAFE_FREE(f->subfname);
- f->subfname = n2; /* Passing ownership of
- return from alloc_sub_basic
- above. */
+ f->subfname = SMB_STRDUP(n2);
+ TALLOC_FREE(n2);
return true;
}
TALLOC_FREE(n2);