From: Jeremy Allison <jra@samba.org>
Date: Tue, 28 Jan 2020 17:36:26 +0000 (-0800)
Subject: s3: smbd: dfs: Clean up exits / talloc heirarchy in parse_msdfs_symlink().
X-Git-Tag: ldb-2.1.1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74b47bf578dab9ce94a9f2439fa672e51afe809e;p=thirdparty%2Fsamba.git

s3: smbd: dfs: Clean up exits / talloc heirarchy in parse_msdfs_symlink().

Ensure on error or clean return we don't leave memory on mem_ctx.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
---

diff --git a/source3/smbd/msdfs.c b/source3/smbd/msdfs.c
index f4c847a645a..d48b8952d38 100644
--- a/source3/smbd/msdfs.c
+++ b/source3/smbd/msdfs.c
@@ -543,11 +543,13 @@ bool parse_msdfs_symlink(TALLOC_CTX *ctx,
 	prot = strtok_r(temp, ":", &saveptr);
 	if (!prot) {
 		DEBUG(0,("parse_msdfs_symlink: invalid path !\n"));
+		TALLOC_FREE(temp);
 		return false;
 	}
 
 	alt_path = talloc_array(ctx, char *, MAX_REFERRAL_COUNT);
 	if (!alt_path) {
+		TALLOC_FREE(temp);
 		return false;
 	}
 
@@ -568,6 +570,7 @@ bool parse_msdfs_symlink(TALLOC_CTX *ctx,
 		reflist = talloc_zero_array(ctx,
 				struct referral, count);
 		if(reflist == NULL) {
+			TALLOC_FREE(temp);
 			TALLOC_FREE(alt_path);
 			return false;
 		}
@@ -588,10 +591,13 @@ bool parse_msdfs_symlink(TALLOC_CTX *ctx,
 			p++;
 		}
 
-		reflist[i].alternate_path = talloc_asprintf(ctx,
+		reflist[i].alternate_path = talloc_asprintf(reflist,
 				"\\%s",
 				p);
 		if (!reflist[i].alternate_path) {
+			TALLOC_FREE(temp);
+			TALLOC_FREE(alt_path);
+			TALLOC_FREE(reflist);
 			return false;
 		}
 
@@ -603,10 +609,13 @@ bool parse_msdfs_symlink(TALLOC_CTX *ctx,
 
 	if (ppreflist != NULL) {
 		*ppreflist = reflist;
+	} else {
+		TALLOC_FREE(reflist);
 	}
 	if (prefcount != NULL) {
 		*prefcount = count;
 	}
+	TALLOC_FREE(temp);
 	TALLOC_FREE(alt_path);
 	return true;
 }