From: Volker Lendecke <vl@samba.org>
Date: Mon, 7 Apr 2008 08:19:25 +0000 (+0200)
Subject: Fix bug 5375
X-Git-Tag: samba-3.3.0pre1~2889
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d3c31aa36c451f0a19496cd33c0b055b466e6b09;p=thirdparty%2Fsamba.git

Fix bug 5375

Thanks to Moskvin for testing
---

diff --git a/source/lib/util_str.c b/source/lib/util_str.c
index cb8a100fa7b..6310e2464d0 100644
--- a/source/lib/util_str.c
+++ b/source/lib/util_str.c
@@ -1972,25 +1972,26 @@ int str_list_count( const char **list )
 }
 
 /******************************************************************************
- version of standard_sub_basic() for string lists; uses alloc_sub_basic()
+ version of standard_sub_basic() for string lists; uses talloc_sub_basic()
  for the work
  *****************************************************************************/
 
 bool str_list_sub_basic( char **list, const char *smb_name,
 			 const char *domain_name )
 {
+	TALLOC_CTX *ctx = list;
 	char *s, *tmpstr;
 
 	while ( *list ) {
 		s = *list;
-		tmpstr = alloc_sub_basic(smb_name, domain_name, s);
+		tmpstr = talloc_sub_basic(ctx, smb_name, domain_name, s);
 		if ( !tmpstr ) {
 			DEBUG(0,("str_list_sub_basic: "
 				"alloc_sub_basic() return NULL!\n"));
 			return false;
 		}
 
-		SAFE_FREE(*list);
+		TALLOC_FREE(*list);
 		*list = tmpstr;
 
 		list++;