Skip to content

Commit

Permalink
[iso] fix case sensitive comparison when preventing 'ldlinux.sys' ove…
Browse files Browse the repository at this point in the history
…rwrite

* Because we install our own ldlinux.sys, we must ensure that if the ISO contains
  an ldlinux.sys in the root directory, this file is not copied over. However, our
  comparison for the 'ldlinux.sys' string was case sensitive which means that some
  ISOs such as R-Drive Image boot ISO, that use 'LDLINUX.SYS' were trying write over
  our file, resulting in a file extraction failure.
* This patch ensures that the string comparison for 'ldlinux.sys' is case insensitive.
* Also add 512px sized icon (upscaled using waifu2x)
  • Loading branch information
pbatard committed Aug 29, 2019
1 parent 7980292 commit b251930
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
Binary file added res/icons/rufus-512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/iso.c
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ static BOOL check_iso_props(const char* psz_dirname, int64_t file_length, const
}

// In case there's an ldlinux.sys on the ISO, prevent it from overwriting ours
if ((psz_dirname != NULL) && (psz_dirname[0] == 0) && (safe_strcmp(psz_basename, ldlinux_name) == 0)) {
uprintf("skipping % file from ISO image\n", ldlinux_name);
if ((psz_dirname != NULL) && (psz_dirname[0] == 0) && (safe_stricmp(psz_basename, ldlinux_name) == 0)) {
uprintf("Skipping '%s' file from ISO image", psz_basename);
return TRUE;
}
} else { // Scan-time checks
Expand Down
10 changes: 5 additions & 5 deletions src/rufus.rc
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.7.1571"
CAPTION "Rufus 3.7.1572"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
Expand Down Expand Up @@ -394,8 +394,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,7,1571,0
PRODUCTVERSION 3,7,1571,0
FILEVERSION 3,7,1572,0
PRODUCTVERSION 3,7,1572,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.7.1571"
VALUE "FileVersion", "3.7.1572"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "� 2011-2019 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.7.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.7.1571"
VALUE "ProductVersion", "3.7.1572"
END
END
BLOCK "VarFileInfo"
Expand Down

0 comments on commit b251930

Please sign in to comment.