Avoid if (not NULL) free().

This fixes some COdeQL warnings.
mbroz · Jan 16, 2025 · 36574dd · 36574dd
1 parent 8364178
commit 36574dd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/lib/bitlk/bitlk.c b/lib/bitlk/bitlk.c
@@ -375,10 +375,8 @@ void BITLK_bitlk_vmk_free(struct bitlk_vmk *vmk)
 	struct bitlk_vmk *vmk_next = NULL;
 
 	while (vmk) {
-		if (vmk->guid)
-			free(vmk->guid);
-		if (vmk->name)
-			free(vmk->name);
+		free(vmk->guid);
+		free(vmk->name);
 		crypt_free_volume_key(vmk->vk);
 		vmk_next = vmk->next;
 		free(vmk);
@@ -392,8 +390,7 @@ void BITLK_bitlk_metadata_free(struct bitlk_metadata *metadata)
 		return;
 
 	free(metadata->guid);
-	if (metadata->description)
-		free(metadata->description);
+	free(metadata->description);
 	BITLK_bitlk_vmk_free(metadata->vmks);
 	BITLK_bitlk_fvek_free(metadata->fvek);
 }
@@ -717,10 +714,8 @@ int BITLK_read_sb(struct crypt_device *cd, struct bitlk_metadata *params)
 
 		start += entry_size;
 	}
-
 out:
-	if (fve_entries)
-		free(fve_entries);
+	free(fve_entries);
 	return r;
 }
 

diff --git a/lib/crypto_backend/argon2/core.c b/lib/crypto_backend/argon2/core.c
@@ -356,12 +356,9 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) {
     }
 
 fail:
-    if (thread != NULL) {
-        free(thread);
-    }
-    if (thr_data != NULL) {
-        free(thr_data);
-    }
+    free(thread);
+    free(thr_data);
+
     return rc;
 }
 

diff --git a/lib/utils_keyring.c b/lib/utils_keyring.c
@@ -363,8 +363,7 @@ key_serial_t keyring_find_key_id_by_name(const char *key_name)
 		id = 0;
 
 out:
-	if (name_copy)
-		free(name_copy);
+	free(name_copy);
 
 	return id;
 }

diff --git a/src/integritysetup.c b/src/integritysetup.c
@@ -286,8 +286,7 @@ static int action_resize(void)
 		}
 	}
 out:
-	if (backing_file)
-		free(backing_file);
+	free(backing_file);
 	crypt_free(cd);
 	return r;
 }