From: Joseph Sutton <josephsutton@catalyst.net.nz>
Date: Thu, 16 Nov 2023 01:50:58 +0000 (+1300)
Subject: librpc:ndr: Move call to convert_string_talloc() on to its own line
X-Git-Tag: talloc-2.4.2~661
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e01e6202e606476066231b0b84903c604db07a6e;p=thirdparty%2Fsamba.git

librpc:ndr: Move call to convert_string_talloc() on to its own line

Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/librpc/ndr/ndr_string.c b/librpc/ndr/ndr_string.c
index 983e248c0f1..5e8eb895bf7 100644
--- a/librpc/ndr/ndr_string.c
+++ b/librpc/ndr/ndr_string.c
@@ -319,11 +319,15 @@ _PUBLIC_ enum ndr_err_code ndr_push_string(struct ndr_push *ndr, ndr_flags_type
 			return ndr_push_error(ndr, NDR_ERR_ALLOC,
 					      "Failed to talloc_strndup() in ndr_string_push()");
 		}
-	} else if (!convert_string_talloc(ndr, CH_UNIX, chset, s, s_len,
-					  &dest, &d_len))
-	{
-		return ndr_push_error(ndr, NDR_ERR_CHARCNV,
-				      "Bad character push conversion with flags 0x%"PRI_LIBNDR_FLAGS, flags);
+	} else {
+		bool ok;
+
+		ok = convert_string_talloc(ndr, CH_UNIX, chset, s, s_len,
+					   &dest, &d_len);
+		if (!ok) {
+			return ndr_push_error(ndr, NDR_ERR_CHARCNV,
+					      "Bad character push conversion with flags 0x%"PRI_LIBNDR_FLAGS, flags);
+		}
 	}
 
 	if (flags & LIBNDR_FLAG_STR_BYTESIZE) {