mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-29 05:55:30 -04:00
Code Issues Projects Releases Packages Wiki Activity

[md5sum] fix md5sum computation for the setup wrapper

Browse source 
* Also fix a couple small memory leaks and potential NULL deref.
* Also report saved path when saving to image.
This commit is contained in:
Pete Batard 2024-10-10 13:04:58 +01:00
parent ede52c57e6
commit 5439ca8a83
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
7 changed files with 42 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/vhd.c
View file

@ -729,7 +729,7 @@ BOOL WimExtractFile(const char* image, int index, const char* src, const char* d
/// <returns>TRUE if the index was found in the image, FALSE otherwise.</returns>
BOOL WimIsValidIndex(const char* image, int index)
{
int i = 1;
int i = 1, cur_index;
BOOL r = FALSE;
DWORD dw = 0;
HANDLE hWim = NULL;
@ -768,7 +768,9 @@ BOOL WimIsValidIndex(const char* image, int index)
goto out;
while ((str = get_token_data_file_indexed("IMAGE INDEX", xml_file, i)) != NULL) {
if (atoi(str) == index) {
cur_index = atoi(str);
safe_free(str);
if (cur_index == index) {
r = TRUE;
break;
}
@ -1061,7 +1063,7 @@ static DWORD WINAPI VhdSaveImageThread(void* param)
r = 0;
UpdateProgressWithInfo(OP_FORMAT, MSG_261, SelectedDrive.DiskSize, SelectedDrive.DiskSize);
uprintf("Operation complete.");
uprintf("Saved '%s'", img_save->ImagePath);
out:
safe_closehandle(overlapped.hEvent);
@ -1100,6 +1102,8 @@ static DWORD WINAPI FfuSaveImageThread(void* param)
safe_free(img_save->DevicePath);
safe_free(img_save->ImagePath);
PostMessage(hMainDialog, UM_FORMAT_COMPLETED, (WPARAM)TRUE, 0);
if (!IS_ERROR(ErrorStatus))
uprintf("Saved '%s'", img_save->ImagePath);
ExitThread(r);
}