From 8c2f826553d35fb69cb570ee1b92a2792b603f86 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Wed, 9 May 2012 09:16:54 +0200 Subject: [PATCH] s3: Fix Coverity ID 242692 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(-) diff --git a/source3/rpc_client/cli_winreg_spoolss.c b/source3/rpc_client/cli_winreg_spoolss.c index 28e18d10dd5..2686c60e62f 100644 --- a/source3/rpc_client/cli_winreg_spoolss.c +++ b/source3/rpc_client/cli_winreg_spoolss.c @@ -2696,6 +2696,7 @@ WERROR winreg_printer_enumforms1(TALLOC_CTX *mem_ctx, uint32_t num_builtin = ARRAY_SIZE(builtin_forms1); uint32_t i; WERROR result; + WERROR ignore; NTSTATUS status; const char **enum_names = NULL; enum winreg_Type *enum_types = NULL; @@ -2817,15 +2818,11 @@ WERROR winreg_printer_enumforms1(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(enum_values); -- 2.11.4.GIT