From 318cf16f7be6df6f4711153c685cbb9a510dfe19 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 9 May 2012 09:16:54 +0200 Subject: s3: Fix Coverity ID 242693 Dereference before null check winreg_printer_openkey above already dereferences winreg_handle --- source3/rpc_client/cli_winreg_spoolss.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'source3/rpc_client/cli_winreg_spoolss.c') diff --git a/source3/rpc_client/cli_winreg_spoolss.c b/source3/rpc_client/cli_winreg_spoolss.c index c3c853d23f..28e18d10dd 100644 --- a/source3/rpc_client/cli_winreg_spoolss.c +++ b/source3/rpc_client/cli_winreg_spoolss.c @@ -2602,6 +2602,7 @@ WERROR winreg_printer_addform1(TALLOC_CTX *mem_ctx, union spoolss_FormInfo *info = NULL; uint32_t i; WERROR result; + WERROR ignore; NTSTATUS status; TALLOC_CTX *tmp_ctx; @@ -2670,15 +2671,11 @@ WERROR winreg_printer_addform1(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(info); -- cgit