s3: Fix Coverity ID 242695 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 1d90d5e69e029efdf24268613ecf5d705a05326c..1cf034e9f244b551409ac963e3c03307bd09fb84 100644 (file)
--- a/source3/rpc_client/cli_winreg_spoolss.c
+++ b/source3/rpc_client/cli_winreg_spoolss.c
@@ -1348,6 +1348,7 @@ WERROR winreg_get_printer(TALLOC_CTX *mem_ctx,
        char *path;
        NTSTATUS status;
        WERROR result = WERR_OK;
+       WERROR ignore;
        const char **enum_names = NULL;
        enum winreg_Type *enum_types = NULL;
        DATA_BLOB *enum_data_blobs = NULL;
@@ -1595,15 +1596,11 @@ WERROR winreg_get_printer(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);