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

s3: Fix Coverity ID 242705 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 64495f41351..27bcb59099f 100644
--- a/source3/rpc_client/cli_winreg_spoolss.c
+++ b/source3/rpc_client/cli_winreg_spoolss.c
@@ -3056,6 +3056,7 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx,
 	uint32_t num_builtin = ARRAY_SIZE(builtin_forms1);
 	uint32_t i;
 	WERROR result;
+	WERROR ignore;
 	NTSTATUS status;
 	TALLOC_CTX *tmp_ctx;
 
@@ -3158,15 +3159,11 @@ WERROR winreg_printer_getform1(TALLOC_CTX *mem_ctx,
 
 	result = WERR_OK;
 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);