Fixed resource leak and possible strings corruption

Signed-off-by: Ingo Weinhold <[email protected]>
This commit is contained in:
Ezo
2013-11-22 13:44:10 +01:00
committed by Ingo Weinhold
parent 4981e77645
commit 7f6991c35e
+4 -4
View File
@@ -1484,11 +1484,11 @@ swap_init_post_modules()
// User specified a size / volume that seems valid // User specified a size / volume that seems valid
swapAutomatic = false; swapAutomatic = false;
swapSize = atoll(size); swapSize = atoll(size);
strncpy(selectedVolume.name, volume, strlcpy(selectedVolume.name, volume,
sizeof(selectedVolume.name)); sizeof(selectedVolume.name));
strncpy(selectedVolume.device, device, strlcpy(selectedVolume.device, device,
sizeof(selectedVolume.device)); sizeof(selectedVolume.device));
strncpy(selectedVolume.filesystem, filesystem, strlcpy(selectedVolume.filesystem, filesystem,
sizeof(selectedVolume.filesystem)); sizeof(selectedVolume.filesystem));
selectedVolume.capacity = atoll(capacity); selectedVolume.capacity = atoll(capacity);
} else { } else {
@@ -1498,8 +1498,8 @@ swap_init_post_modules()
"using automatic swap\n", __func__); "using automatic swap\n", __func__);
} }
} }
unload_driver_settings(settings);
} }
unload_driver_settings(settings);
} }
if (swapAutomatic) { if (swapAutomatic) {