From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 27 Aug 2012 21:46:49 +0000 (+1000)
Subject: s3-param: Avoid assert on use of talloc_tos() without stackframe
X-Git-Tag: samba-4.0.0beta7~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e17bf6af22a672ae42f458e8904531d0c36c088f;p=thirdparty%2Fsamba.git

s3-param: Avoid assert on use of talloc_tos() without stackframe

This is hit during samba-tool domain classicupgrade

Andrew Bartlett
---

diff --git a/source3/param/loadparm.c b/source3/param/loadparm.c
index d9ce4b4b584..c92b6319b7a 100644
--- a/source3/param/loadparm.c
+++ b/source3/param/loadparm.c
@@ -2784,13 +2784,14 @@ static bool handle_dos_charset(struct loadparm_context *unused, int snum, const
 static bool handle_realm(struct loadparm_context *unused, int snum, const char *pszParmValue, char **ptr)
 {
 	bool ret = true;
-	char *realm = strupper_talloc(talloc_tos(), pszParmValue);
+	TALLOC_CTX *frame = talloc_stackframe();
+	char *realm = strupper_talloc(frame, pszParmValue);
 	char *dnsdomain = strlower_talloc(realm, pszParmValue);
 
 	ret &= string_set(&Globals.szRealm, pszParmValue);
 	ret &= string_set(&Globals.szRealm_upper, realm);
 	ret &= string_set(&Globals.szRealm_lower, dnsdomain);
-	TALLOC_FREE(realm);
+	TALLOC_FREE(frame);
 
 	return ret;
 }