From: Jeremy Allison <jra@samba.org>
Date: Wed, 15 Jul 2020 20:33:27 +0000 (-0700)
Subject: s3: libsmb: Cleanup - namecache_store() - use common out.
X-Git-Tag: talloc-2.3.2~1095
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df0e54bea307b459433e1fdf9dc547875ee494cc;p=thirdparty%2Fsamba.git

s3: libsmb: Cleanup - namecache_store() - use common out.

Prepare for moving malloc values to talloc.

Signed-off-by: Jeremy Allison <jra@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/source3/libsmb/namecache.c b/source3/libsmb/namecache.c
index 1127874c375..a4de493b08e 100644
--- a/source3/libsmb/namecache.c
+++ b/source3/libsmb/namecache.c
@@ -223,8 +223,8 @@ bool namecache_store(const char *name,
 	TALLOC_CTX *frame = talloc_stackframe();
 
 	if (name_type > 255) {
-		TALLOC_FREE(frame);
-		return false; /* Don't store non-real name types. */
+		/* Don't store non-real name types. */
+		goto out;
 	}
 
 	if ( DEBUGLEVEL >= 5 ) {
@@ -248,8 +248,7 @@ bool namecache_store(const char *name,
 
 	key = namecache_key(name, name_type);
 	if (!key) {
-		TALLOC_FREE(frame);
-		return false;
+		goto out;
 	}
 
 	expiry = time(NULL) + lp_name_cache_timeout();
@@ -260,14 +259,14 @@ bool namecache_store(const char *name,
 	 * place each single ip
 	 */
 	if (!ipstr_list_make(&value_string, ip_list, num_names)) {
-		SAFE_FREE(key);
-		SAFE_FREE(value_string);
-		TALLOC_FREE(frame);
-		return false;
+		goto out;
 	}
 
 	/* set the entry */
 	ret = gencache_set(key, value_string, expiry);
+
+  out:
+
 	SAFE_FREE(key);
 	SAFE_FREE(value_string);
 	TALLOC_FREE(frame);