s3: Fix Coverity ID 242693 Dereference before null check
authorVolker Lendecke <vl@samba.org>
Wed, 9 May 2012 07:16:54 +0000 (09:16 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 10 May 2012 07:11:56 +0000 (09:11 +0200)
winreg_printer_openkey above already dereferences winreg_handle

source3/rpc_client/cli_winreg_spoolss.c

index c3c853d23f459b02d6addda91b96f16ca20ebabd..28e18d10dd570d9174a18d116c9355061e4c26a5 100644 (file)
@@ -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);