From: Noel Power <noel.power@suse.com>
Date: Fri, 4 Sep 2020 02:22:21 +0000 (-0700)
Subject: s3/libsmb: Cleanup coding in convert_ss2service()
X-Git-Tag: talloc-2.3.2~590
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e68e0402cce7a370512dbbd1da5e4b3a7a828eb2;p=thirdparty%2Fsamba.git

s3/libsmb: Cleanup coding in convert_ss2service()

Don't update out params when unsuccessful

Signed-off-by: Noel Power <noel.power@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
---

diff --git a/source3/libsmb/namequery.c b/source3/libsmb/namequery.c
index 607ad722aab..d6077230fec 100644
--- a/source3/libsmb/namequery.c
+++ b/source3/libsmb/namequery.c
@@ -1686,7 +1686,6 @@ static bool convert_ss2service(struct ip_service **return_iplist,
 	struct ip_service *iplist = NULL;
 
 	if (orig_count == 0 || ss_list == NULL) {
-		*count_out = 0;
 		return false;
 	}
 
@@ -1698,7 +1697,6 @@ static bool convert_ss2service(struct ip_service **return_iplist,
 		real_count++;
 	}
 	if (real_count == 0) {
-		*count_out = 0;
 		return false;
 	}
 
@@ -1706,7 +1704,6 @@ static bool convert_ss2service(struct ip_service **return_iplist,
 	iplist = SMB_MALLOC_ARRAY(struct ip_service, real_count);
 	if (iplist == NULL) {
 		DBG_ERR("malloc failed for %zu enetries!\n", real_count);
-		*count_out = 0;
 		return false;
 	}