eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-13 11:50:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some warning and leaks in api test code.

Browse Source
This commit is contained in:
Milan Broz
2017-10-28 11:59:06 +02:00
parent b78bd4ccce
commit 6e3622e0f1
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api-test-2.c
View File

@@ -259,7 +259,9 @@ static void _cleanup(void)
_system("rm -f " IMAGE1, 0);
_system("rm -rf " CONV_DIR, 0);
if (test_loop_file)
remove(test_loop_file);
if (tmp_file_1)
remove(tmp_file_1);
remove(VALID_LUKS2_HEADER);

2
tests/api-test.c
View File

@@ -199,7 +199,9 @@ static void _cleanup(void)
_system("rm -f " IMAGE_EMPTY, 0);
_system("rm -f " IMAGE1, 0);
if (test_loop_file)
remove(test_loop_file);
if (tmp_file_1)
remove(tmp_file_1);
remove(EVL_HEADER_1);

12
tests/test_utils.c
View File

@@ -301,10 +301,13 @@ static int t_dm_satisfies_version(unsigned target_maj, unsigned target_min,
static void t_dm_set_crypt_compat(const char *dm_version, unsigned crypt_maj,
unsigned crypt_min, unsigned crypt_patch)
{
unsigned dm_maj, dm_min, dm_patch;
unsigned dm_maj = 0, dm_min = 0, dm_patch = 0;
if (sscanf(dm_version, "%u.%u.%u", &dm_maj, &dm_min, &dm_patch) != 3)
dm_maj = dm_min = dm_patch = 0;
if (sscanf(dm_version, "%u.%u.%u", &dm_maj, &dm_min, &dm_patch) != 3) {
dm_maj = 0;
dm_min = 0;
dm_patch = 0;
}
if (t_dm_satisfies_version(1, 2, crypt_maj, crypt_min))
t_dm_crypt_flags |= T_DM_KEY_WIPE_SUPPORTED;
@@ -372,6 +375,9 @@ int t_dm_check_versions(void)
if (!dm_task_run(dmt))
goto out;
if (!dm_task_get_driver_version(dmt, dm_version, sizeof(dm_version)))
goto out;
target = dm_task_get_versions(dmt);
do {
last_target = target;