From: Volker Lendecke <vl@samba.org>
Date: Wed, 9 May 2012 07:16:54 +0000 (+0200)
Subject: s3: Fix Coverity ID 242696 Dereference before null check
X-Git-Tag: samba-4.0.0alpha21~239
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=600c4c9c45396f2521f413abb0a4e1a3567b869c;p=thirdparty%2Fsamba.git

s3: Fix Coverity ID 242696 Dereference before null check

winreg_printer_openkey above already dereferences winreg_handle
---

diff --git a/source3/rpc_client/cli_winreg_spoolss.c b/source3/rpc_client/cli_winreg_spoolss.c
index cd2cf681b86..1d90d5e69e0 100644
--- a/source3/rpc_client/cli_winreg_spoolss.c
+++ b/source3/rpc_client/cli_winreg_spoolss.c
@@ -1906,6 +1906,7 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx,
 	struct winreg_String wvalue = { 0, };
 	char *path;
 	WERROR result = WERR_OK;
+	WERROR ignore;
 	NTSTATUS status;
 	TALLOC_CTX *tmp_ctx;
 
@@ -1955,15 +1956,11 @@ WERROR winreg_set_printer_dataex(TALLOC_CTX *mem_ctx,
 	}
 
 done:
-	if (winreg_handle != NULL) {
-		WERROR ignore;
-
-		if (is_valid_policy_hnd(&key_hnd)) {
-			dcerpc_winreg_CloseKey(winreg_handle, tmp_ctx, &key_hnd, &ignore);
-		}
-		if (is_valid_policy_hnd(&hive_hnd)) {
-			dcerpc_winreg_CloseKey(winreg_handle, tmp_ctx, &hive_hnd, &ignore);
-		}
+	if (is_valid_policy_hnd(&key_hnd)) {
+		dcerpc_winreg_CloseKey(winreg_handle, tmp_ctx, &key_hnd, &ignore);
+	}
+	if (is_valid_policy_hnd(&hive_hnd)) {
+		dcerpc_winreg_CloseKey(winreg_handle, tmp_ctx, &hive_hnd, &ignore);
 	}
 
 	TALLOC_FREE(tmp_ctx);