diff --git a/configure b/configure index 729852ee..525a4279 100644 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for rufus 1.3.1. +# Generated by GNU Autoconf 2.68 for rufus 1.3.2. # # Report bugs to . # @@ -559,8 +559,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='1.3.1' -PACKAGE_STRING='rufus 1.3.1' +PACKAGE_VERSION='1.3.2' +PACKAGE_STRING='rufus 1.3.2' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='http://rufus.akeo.ie' @@ -1201,7 +1201,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rufus 1.3.1 to adapt to many kinds of systems. +\`configure' configures rufus 1.3.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1267,7 +1267,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 1.3.1:";; + short | recursive ) echo "Configuration of rufus 1.3.2:";; esac cat <<\_ACEOF @@ -1355,7 +1355,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 1.3.1 +rufus configure 1.3.2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1410,7 +1410,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rufus $as_me 1.3.1, which was +It was created by rufus $as_me 1.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2225,7 +2225,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='1.3.1' + VERSION='1.3.2' cat >>confdefs.h <<_ACEOF @@ -4067,7 +4067,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rufus $as_me 1.3.1, which was +This file was extended by rufus $as_me 1.3.2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4121,7 +4121,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rufus config.status 1.3.1 +rufus config.status 1.3.2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f9854e7e..eecd2734 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [1.3.1], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) +AC_INIT([rufus], [1.3.2], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/src/dos.c b/src/dos.c index fbc7ac24..a9889a8c 100644 --- a/src/dos.c +++ b/src/dos.c @@ -419,7 +419,7 @@ BOOL ExtractFreeDOS(const char* path) res_data = (BYTE*)LockResource(res_handle); res_size = SizeofResource(NULL, res); - safe_strcpy(filename, sizeof(filename), (i<2)?path:locale_path); + safe_strcpy(filename, sizeof(filename), ((i<2)?path:locale_path)); safe_strcat(filename, sizeof(filename), "\\"); safe_strcat(filename, sizeof(filename), res_name[i]); diff --git a/src/rufus.c b/src/rufus.c index f0100234..48ca3afe 100644 --- a/src/rufus.c +++ b/src/rufus.c @@ -1496,7 +1496,7 @@ void InitDialog(HWND hDlg) { HINSTANCE hDllInst; HDC hDC; - int i, i16, s16, s32; + int i, i16, s16; char tmp[128], *token; #ifdef RUFUS_TEST @@ -1524,7 +1524,6 @@ void InitDialog(HWND hDlg) ReleaseDC(hDlg, hDC); // Adjust icon size lookup s16 = i16; - s32 = (int)(32.0f*fScale); if (s16 >= 54) s16 = 64; else if (s16 >= 40) @@ -1533,14 +1532,6 @@ void InitDialog(HWND hDlg) s16 = 32; else if (s16 >= 20) s16 = 24; - if (s32 >= 54) - s32 = 64; - else if (s32 >= 40) - s32 = 48; - else if (s32 >= 28) - s32 = 32; - else if (s32 >= 20) - s32 = 24; // Create the title bar icon SetTitleBarIcon(hDlg); diff --git a/src/rufus.rc b/src/rufus.rc index 8c12b24b..2ec2c83d 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.3.1.225" +CAPTION "Rufus v1.3.2.226" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -274,8 +274,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,1,225 - PRODUCTVERSION 1,3,1,225 + FILEVERSION 1,3,2,226 + PRODUCTVERSION 1,3,2,226 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -292,13 +292,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.3.1.225" + VALUE "FileVersion", "1.3.2.226" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "(c) 2011-2012 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.3.1.225" + VALUE "ProductVersion", "1.3.2.226" END END BLOCK "VarFileInfo" diff --git a/src/stdlg.c b/src/stdlg.c index b482ae6d..49313672 100644 --- a/src/stdlg.c +++ b/src/stdlg.c @@ -550,6 +550,8 @@ fallback: // Set the file extension filters ext_strlen = safe_strlen(ext_desc) + 2*safe_strlen(ext) + sizeof(" (*.)\0*.\0All Files (*.*)\0*.*\0\0"); ext_string = (char*)malloc(ext_strlen); + if (ext_string == NULL) + return NULL; safe_sprintf(ext_string, ext_strlen, "%s (*.%s)\r*.%s\rAll Files (*.*)\r*.*\r\0", ext_desc, ext, ext); // Microsoft could really have picked a better delimiter! for (i=0; i> SECTOR_SHIFT; sectors = (libfat_sector_t*) calloc(ldlinux_sectors, sizeof *sectors); + if (sectors == NULL) + goto out; fs = libfat_open(libfat_readfile, (intptr_t) d_handle); ldlinux_cluster = libfat_searchdir(fs, 0, "LDLINUX SYS", NULL); secp = sectors; diff --git a/src/vhd.c b/src/vhd.c index bc9495e5..59cf1271 100644 --- a/src/vhd.c +++ b/src/vhd.c @@ -210,6 +210,8 @@ BOOL WimExtractFile(const char* image, int index, const char* src, const char* d { if ((!has_wimgapi) && (!has_7z) && (!WimExtractCheck())) return FALSE; + if ((image == NULL) || (src == NULL) || (dst == NULL)) + return FALSE; // Prefer 7-Zip as, unsurprisingly, it's faster than the Microsoft way, // but allow fallback if 7-Zip doesn't succeed