From: Andreas Schneider <asn@samba.org>
Date: Wed, 25 Nov 2020 10:38:01 +0000 (+0100)
Subject: winexe: Fix a possible null pointer derference
X-Git-Tag: samba-4.14.0rc1~558
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12b9e4408d7e1edd1741d5afdf359bca82d3f75e;p=thirdparty%2Fsamba.git

winexe: Fix a possible null pointer derference

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/examples/winexe/winexe.c b/examples/winexe/winexe.c
index 95386211c0a..529858ccbb8 100644
--- a/examples/winexe/winexe.c
+++ b/examples/winexe/winexe.c
@@ -347,7 +347,7 @@ static NTSTATUS winexe_svc_upload(
 	int flags)
 {
 	struct cli_state *cli;
-	uint16_t fnum;
+	uint16_t fnum = 0xffff;
 	NTSTATUS status;
 	const DATA_BLOB *binary = NULL;
 
@@ -389,7 +389,7 @@ static NTSTATUS winexe_svc_upload(
 	}
 
 	if (binary == NULL) {
-		//TODO
+		goto done;
 	}
 
 	status = cli_ntcreate(
@@ -420,16 +420,20 @@ static NTSTATUS winexe_svc_upload(
 		NULL);
 	if (!NT_STATUS_IS_OK(status)) {
 		DBG_WARNING("Could not write file: %s\n", nt_errstr(status));
-		goto close_done;
+		goto done;
 	}
 
-close_done:
-	status = cli_close(cli, fnum);
-	if (!NT_STATUS_IS_OK(status)) {
-		DBG_WARNING("Close(%"PRIu16") failed for %s: %s\n", fnum,
-			    service_filename, nt_errstr(status));
-	}
 done:
+	if (fnum != 0xffff) {
+		status = cli_close(cli, fnum);
+		if (!NT_STATUS_IS_OK(status)) {
+			DBG_WARNING("Close(%"PRIu16") failed for %s: %s\n",
+				    fnum,
+				    service_filename,
+				    nt_errstr(status));
+		}
+	}
+
 	TALLOC_FREE(cli);
 	return status;
 }