nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[syslinux] fix a typo that reintroduced a possible crash

Browse source 
* a10a207790 reintroduced the crash that was fixed in ad68ccfac9
  due to the missing semicolon.
* Also fix a minor output message issue
* Closes #752
This commit is contained in:
Pete Batard 2016-05-16 16:33:53 +01:00
parent 0abd745a87
commit 1a24e5bbd7
5 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -4,6 +4,7 @@ o Version 2.9 (2016.05.??)
Fix unwanted listing of some internal removable drives
Fix missing default cluster size default on exFAT for >32GB drives
Fix the non-removal of the commandline hogger in some corner cases
Fix a potential Syslinux crash... again
Use "modern" file selection dialog on Vista or later (if you can spot the difference, good for you...)
o Version 2.8 (2016.03.22)

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.9.926"
CAPTION "Rufus 2.9.927"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -320,8 +320,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,9,926,0
PRODUCTVERSION 2,9,926,0
FILEVERSION 2,9,927,0
PRODUCTVERSION 2,9,927,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -338,13 +338,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.9.926"
VALUE "FileVersion", "2.9.927"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2016 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.9.926"
VALUE "ProductVersion", "2.9.927"
END
END
BLOCK "VarFileInfo"

2
src/stdio.c
View file

@ -340,7 +340,7 @@ BOOL WriteFileWithRetry(HANDLE hFile, LPCVOID lpBuffer, DWORD nNumberOfBytesToWr
nNumberOfBytesToWrite, nTry < nNumRetries ? retry_msg : "");
}
else {
uprintf(" Write error [0x%8X]%s", GetLastError(), nTry < nNumRetries ? retry_msg : "");
uprintf(" Write error [0x%08X]%s", GetLastError(), nTry < nNumRetries ? retry_msg : "");
}
// If we can't reposition for the next run, just abort
if (!readFilePointer)

3
src/syslinux.c
View file

@ -263,7 +263,8 @@ BOOL InstallSyslinux(DWORD drive_index, char drive_letter, int fs_type)
/* Patch ldlinux.sys and the boot sector */
if (syslinux_patch(sectors, nsectors, 0, 0, NULL, NULL) < 0) {
uprintf("Could not patch Syslinux files");
uprintf("Could not patch Syslinux files.");
uprintf("WARNING: This could be caused by your firewall having modifed downloaded content, such as 'ldlinux.sys'...");
goto out;
}

2
src/syslinux/libinstaller/syslxmod.c
View file

@ -125,7 +125,7 @@ int syslinux_patch(const sector_t *sectp, int nsectors,
dw = (boot_image_len - sizeof(struct patch_area)) >> 2;
for (i = 0, wp = (const uint32_t _slimg *)boot_image;
(i <= dw) && ((get_32_sl(wp) != LDLINUX_MAGIC));
i++, wp++)
i++, wp++);
if (i > dw) /* Not found */
return -1;
patcharea = (struct patch_area _slimg *)wp;