From c56d1a054541f46a48053be82e7280ac33687be6 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Fri, 21 Nov 2014 20:01:03 +0000 Subject: [PATCH] [core] fix a crash when an image is selected with no target device * Closes #405 --- src/drive.c | 3 ++- src/rufus.rc | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/drive.c b/src/drive.c index 7a385b6f..fcbf2cd6 100644 --- a/src/drive.c +++ b/src/drive.c @@ -580,7 +580,8 @@ BOOL AnalyzeMBR(HANDLE hPhysicalDrive, const char* TargetName) int i; fake_fd._ptr = (char*)hPhysicalDrive; - fake_fd._bufsiz = SelectedDrive.Geometry.BytesPerSector; + // Must be set to 512, as we also use this method for images and we may not have a target UFD yet + fake_fd._bufsiz = 512; if (!is_br(&fake_fd)) { uprintf("%s does not have an x86 %s\n", TargetName, mbr_name); diff --git a/src/rufus.rc b/src/rufus.rc index ce87e53d..08c5584a 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.547" +CAPTION "Rufus 1.5.0.548" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -164,7 +164,7 @@ END IDD_DIALOG_XP DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Rufus 1.5.0.547" +CAPTION "Rufus 1.5.0.548" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -297,7 +297,7 @@ END IDD_DIALOG_RTL DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.547" +CAPTION "Rufus 1.5.0.548" FONT 8, "Segoe UI", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -437,7 +437,7 @@ END IDD_DIALOG_RTL_XP DIALOGEX 12, 12, 242, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_RTLREADING | WS_EX_APPWINDOW | WS_EX_LAYOUTRTL -CAPTION "Rufus 1.5.0.547" +CAPTION "Rufus 1.5.0.548" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,127,291,50,14 @@ -701,8 +701,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,5,0,547 - PRODUCTVERSION 1,5,0,547 + FILEVERSION 1,5,0,548 + PRODUCTVERSION 1,5,0,548 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -719,13 +719,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.5.0.547" + VALUE "FileVersion", "1.5.0.548" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2014 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.5.0.547" + VALUE "ProductVersion", "1.5.0.548" END END BLOCK "VarFileInfo"