[SCM] Samba Shared Repository - branch v3-5-test updated
Bo Yang
boyang at samba.org
Mon Nov 30 04:20:06 MST 2009
The branch, v3-5-test has been updated
via 9b5f8eb... s3: Fix crash in free_file_list().
from 15f7b70... s3:docs: Document "enable core files".
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -----------------------------------------------------------------
commit 9b5f8eb59ed7f65d4c017cd6a9dc668ebf3115b6
Author: Bo Yang <boyang at samba.org>
Date: Mon Nov 30 17:30:25 2009 +0800
s3: Fix crash in free_file_list().
Signed-off-by: Bo Yang <boyang at samba.org>
(cherry picked from commit 62a27325d99cf4371fe98d049110e585dd209c98)
-----------------------------------------------------------------------
Summary of changes:
source3/param/loadparm.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index 9da853f..1c79ff6 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);
--
Samba Shared Repository
More information about the samba-cvs
mailing list