mirror of
https://gitlab.com/cryptsetup/cryptsetup.git
synced 2025-12-05 16:00:05 +01:00
Avoid if (not NULL) free().
This fixes some COdeQL warnings.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -286,8 +286,7 @@ static int action_resize(void)
|
||||
}
|
||||
}
|
||||
out:
|
||||
if (backing_file)
|
||||
free(backing_file);
|
||||
free(backing_file);
|
||||
crypt_free(cd);
|
||||
return r;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user