From c65b456c6a145d15b7fd27a2a3440a0709fc3277 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 18 Jun 2008 14:50:53 +0200 Subject: [PATCH] Fix Bug #5548 (segfauls in handle_include with %m macro expansion). In alloc_sub_basic, when expanding '%m', substitute "" instead of NULL for remote_machine when this is NULL. Else a NULL string is returned. Michael --- source/lib/substitute.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/source/lib/substitute.c b/source/lib/substitute.c index 17bcbca..926bb82 100644 --- a/source/lib/substitute.c +++ b/source/lib/substitute.c @@ -655,7 +655,10 @@ char *alloc_sub_basic(const char *smb_name, const char *domain_name, a_string = realloc_string_sub(a_string, "%h", myhostname()); break; case 'm' : - a_string = realloc_string_sub(a_string, "%m", remote_machine); + a_string = realloc_string_sub(a_string, "%m", + remote_machine + ? remote_machine + : ""); break; case 'v' : a_string = realloc_string_sub(a_string, "%v", SAMBA_VERSION_STRING); -- 1.5.4.5