net.c (rufus-3.12) | : | net.c (rufus-3.13) | ||
---|---|---|---|---|
skipping to change at line 988 | skipping to change at line 988 | |||
static_sprintf(cmdline, "\"%s\" -NonInteractive -Sta -NoProfile –Executio nPolicy Bypass " | static_sprintf(cmdline, "\"%s\" -NonInteractive -Sta -NoProfile –Executio nPolicy Bypass " | |||
"-File \"%s\" -DisableFirstRunCustomize -PipeName %s -LocData \"% s\" -Icon \"%s\" -AppTitle \"%s\"", | "-File \"%s\" -DisableFirstRunCustomize -PipeName %s -LocData \"% s\" -Icon \"%s\" -AppTitle \"%s\"", | |||
powershell_path, script_path, &pipe[9], locale_str, icon_path, lm printf(MSG_149)); | powershell_path, script_path, &pipe[9], locale_str, icon_path, lm printf(MSG_149)); | |||
// Signal our Windows alert hook that it should close the IE cookie promp ts from Fido | // Signal our Windows alert hook that it should close the IE cookie promp ts from Fido | |||
close_fido_cookie_prompts = TRUE; | close_fido_cookie_prompts = TRUE; | |||
dwExitCode = RunCommand(cmdline, app_dir, TRUE); | dwExitCode = RunCommand(cmdline, app_dir, TRUE); | |||
uprintf("Exited download script with code: %d", dwExitCode); | uprintf("Exited download script with code: %d", dwExitCode); | |||
close_fido_cookie_prompts = FALSE; | close_fido_cookie_prompts = FALSE; | |||
if ((dwExitCode == 0) && PeekNamedPipe(hPipe, NULL, dwPipeSize, NULL, &dw Avail, NULL) && (dwAvail != 0)) { | if ((dwExitCode == 0) && PeekNamedPipe(hPipe, NULL, dwPipeSize, NULL, &dw Avail, NULL) && (dwAvail != 0)) { | |||
url = malloc(dwAvail + 1); | url = malloc(dwAvail + 1); | |||
dwSize = 0; | ||||
if ((url != NULL) && ReadFile(hPipe, url, dwAvail, &dwSize, NULL) && (dwSize > 4)) { | if ((url != NULL) && ReadFile(hPipe, url, dwAvail, &dwSize, NULL) && (dwSize > 4)) { | |||
#else | #else | |||
{ { url = strdup(FORCE_URL); | { { url = strdup(FORCE_URL); | |||
dwSize = (DWORD)strlen(FORCE_URL); | dwSize = (DWORD)strlen(FORCE_URL); | |||
#endif | #endif | |||
IMG_SAVE img_save = { 0 }; | IMG_SAVE img_save = { 0 }; | |||
url[dwSize] = 0; | // WTF is wrong with Microsoft's static analyzer reporting a potential buffer ov | |||
erflow here?!? | ||||
#if defined(_MSC_VER) | ||||
#pragma warning(disable: 6386) | ||||
#endif | ||||
url[min(dwSize, dwAvail)] = 0; | ||||
#if defined(_MSC_VER) | ||||
#pragma warning(default: 6386) | ||||
#endif | ||||
EXT_DECL(img_ext, GetShortName(url), __VA_GROUP__("*.iso" ), __VA_GROUP__(lmprintf(MSG_036))); | EXT_DECL(img_ext, GetShortName(url), __VA_GROUP__("*.iso" ), __VA_GROUP__(lmprintf(MSG_036))); | |||
img_save.Type = IMG_SAVE_TYPE_ISO; | img_save.Type = IMG_SAVE_TYPE_ISO; | |||
img_save.ImagePath = FileDialog(TRUE, NULL, &img_ext, 0); | img_save.ImagePath = FileDialog(TRUE, NULL, &img_ext, 0); | |||
if (img_save.ImagePath == NULL) { | if (img_save.ImagePath == NULL) { | |||
goto out; | goto out; | |||
} | } | |||
// Download the ISO and report errors if any | // Download the ISO and report errors if any | |||
SendMessage(hMainDialog, UM_PROGRESS_INIT, 0, 0); | SendMessage(hMainDialog, UM_PROGRESS_INIT, 0, 0); | |||
FormatStatus = 0; | FormatStatus = 0; | |||
SendMessage(hMainDialog, UM_TIMER_START, 0, 0); | SendMessage(hMainDialog, UM_TIMER_START, 0, 0); | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 10 lines changed or added |