summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerald Carter <jerry@samba.org>2003-12-08 17:42:26 +0000
committerGerald Carter <jerry@samba.org>2003-12-08 17:42:26 +0000
commitb17feb14741c4b295b6fe2282ed764dabd0a31cd (patch)
tree446bd0468b56c5455e293846e50fe32ba8436ecc
parentd1545aba66059b7a65fb46420a6048209cf33620 (diff)
downloadsamba-b17feb14741c4b295b6fe2282ed764dabd0a31cd.tar.gz
samba-b17feb14741c4b295b6fe2282ed764dabd0a31cd.tar.bz2
samba-b17feb14741c4b295b6fe2282ed764dabd0a31cd.zip
working on bug 687; protect against null src strings in alloc_sub_basic()
(This used to be commit b187511920dc6245faeb5ea6b48132bd5ba69ef9)
-rw-r--r--source3/lib/substitute.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/source3/lib/substitute.c b/source3/lib/substitute.c
index ee342964d0..5dec980810 100644
--- a/source3/lib/substitute.c
+++ b/source3/lib/substitute.c
@@ -494,6 +494,13 @@ char *alloc_sub_basic(const char *smb_name, const char *str)
struct passwd *pass;
const char *local_machine_name = get_local_machine_name();
+ /* workaround to prevent a crash while lookinf at bug #687 */
+
+ if ( !str ) {
+ DEBUG(0,("alloc_sub_basic: NULL source string! This should not happen\n"));
+ return NULL;
+ }
+
a_string = strdup(str);
if (a_string == NULL) {
DEBUG(0, ("alloc_sub_specified: Out of memory!\n"));