From 7d2519675cfe75d5710bb5335f3bdfd60acc3760 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 30 Oct 2013 20:29:55 +0000 Subject: [PATCH] [iso] ignore extra nameless files on some UDF images * Closes #155 --- src/iso.c | 2 ++ src/rufus.rc | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/iso.c b/src/iso.c index cfc482ab..079e6d5c 100644 --- a/src/iso.c +++ b/src/iso.c @@ -216,6 +216,8 @@ static int udf_extract_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const cha while ((p_udf_dirent = udf_readdir(p_udf_dirent)) != NULL) { if (FormatStatus) goto out; psz_basename = udf_get_filename(p_udf_dirent); + if (strlen(psz_basename) == 0) + continue; i_length = (int)(3 + strlen(psz_path) + strlen(psz_basename) + strlen(psz_extract_dir) + 24); psz_fullpath = (char*)calloc(sizeof(char), i_length); if (psz_fullpath == NULL) { diff --git a/src/rufus.rc b/src/rufus.rc index 23831a57..b5c0f913 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 329 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.4.0.300" +CAPTION "Rufus v1.4.0.301" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,291,50,14 @@ -285,8 +285,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,4,0,300 - PRODUCTVERSION 1,4,0,300 + FILEVERSION 1,4,0,301 + PRODUCTVERSION 1,4,0,301 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -303,13 +303,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.4.0.300" + VALUE "FileVersion", "1.4.0.301" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2013 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.4.0.300" + VALUE "ProductVersion", "1.4.0.301" END END BLOCK "VarFileInfo"