Skip to content

Commit 36574dd

Browse files
committed
Avoid if (not NULL) free().
This fixes some COdeQL warnings.
1 parent 8364178 commit 36574dd

File tree

4 files changed

+9
-19
lines changed

4 files changed

+9
-19
lines changed

lib/bitlk/bitlk.c

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -375,10 +375,8 @@ void BITLK_bitlk_vmk_free(struct bitlk_vmk *vmk)
375375
struct bitlk_vmk *vmk_next = NULL;
376376

377377
while (vmk) {
378-
if (vmk->guid)
379-
free(vmk->guid);
380-
if (vmk->name)
381-
free(vmk->name);
378+
free(vmk->guid);
379+
free(vmk->name);
382380
crypt_free_volume_key(vmk->vk);
383381
vmk_next = vmk->next;
384382
free(vmk);
@@ -392,8 +390,7 @@ void BITLK_bitlk_metadata_free(struct bitlk_metadata *metadata)
392390
return;
393391

394392
free(metadata->guid);
395-
if (metadata->description)
396-
free(metadata->description);
393+
free(metadata->description);
397394
BITLK_bitlk_vmk_free(metadata->vmks);
398395
BITLK_bitlk_fvek_free(metadata->fvek);
399396
}
@@ -717,10 +714,8 @@ int BITLK_read_sb(struct crypt_device *cd, struct bitlk_metadata *params)
717714

718715
start += entry_size;
719716
}
720-
721717
out:
722-
if (fve_entries)
723-
free(fve_entries);
718+
free(fve_entries);
724719
return r;
725720
}
726721

lib/crypto_backend/argon2/core.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -356,12 +356,9 @@ static int fill_memory_blocks_mt(argon2_instance_t *instance) {
356356
}
357357

358358
fail:
359-
if (thread != NULL) {
360-
free(thread);
361-
}
362-
if (thr_data != NULL) {
363-
free(thr_data);
364-
}
359+
free(thread);
360+
free(thr_data);
361+
365362
return rc;
366363
}
367364

lib/utils_keyring.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,7 @@ key_serial_t keyring_find_key_id_by_name(const char *key_name)
363363
id = 0;
364364

365365
out:
366-
if (name_copy)
367-
free(name_copy);
366+
free(name_copy);
368367

369368
return id;
370369
}

src/integritysetup.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,7 @@ static int action_resize(void)
286286
}
287287
}
288288
out:
289-
if (backing_file)
290-
free(backing_file);
289+
free(backing_file);
291290
crypt_free(cd);
292291
return r;
293292
}

0 commit comments

Comments
 (0)