From f7a190b5fd8f9530de05412ae700977cb4ae9439 Mon Sep 17 00:00:00 2001 From: Bo Yang Date: Mon, 30 Nov 2009 17:30:25 +0800 Subject: [PATCH] s3: Fix crash in free_file_list(). Signed-off-by: Bo Yang (cherry picked from commit 62a27325d99cf4371fe98d049110e585dd209c98) (cherry picked from commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6) --- source3/param/loadparm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c index 9da853f75e3..1c79ff61e5b 100644 --- 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; } /** @@ -7112,9 +7114,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; } SAFE_FREE(n2); -- 2.11.4.GIT