From 09fb7cd9b4e9726fbc2f2c493a7b991a19d737e4 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Wed, 17 Jun 2020 19:24:57 +0100 Subject: [PATCH] [iso] update libcdio to latest --- src/libcdio/iso9660/iso9660_fs.c | 6 +++--- src/rufus.rc | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/libcdio/iso9660/iso9660_fs.c b/src/libcdio/iso9660/iso9660_fs.c index 08023707..c6b8ae48 100644 --- a/src/libcdio/iso9660/iso9660_fs.c +++ b/src/libcdio/iso9660/iso9660_fs.c @@ -823,6 +823,9 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, p_stat = calloc(1, stat_len); first_extent = true; } else { + /* Ignore Rock Ridge Deep Directory RE entries */ + if (p_stat->rr.u_su_fields & ISO_ROCK_SUF_RE) + goto fail; first_extent = false; } if (!p_stat) { @@ -831,9 +834,6 @@ _iso9660_dir_to_statbuf (iso9660_dir_t *p_iso9660_dir, } p_stat->type = (p_iso9660_dir->file_flags & ISO_DIRECTORY) ? _STAT_DIR : _STAT_FILE; - /* Ignore Rock Ridge Deep Directory RE entries */ - if (p_stat->rr.u_su_fields & ISO_ROCK_SUF_RE) - goto fail; /* Test for gaps between extents. Important: Use previous .total_size */ extent_lsn = from_733 (p_iso9660_dir->extent); diff --git a/src/rufus.rc b/src/rufus.rc index 63d55974..0f0e579f 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -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.11.1676" +CAPTION "Rufus 3.11.1677" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -395,8 +395,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,11,1676,0 - PRODUCTVERSION 3,11,1676,0 + FILEVERSION 3,11,1677,0 + PRODUCTVERSION 3,11,1677,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -414,13 +414,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.11.1676" + VALUE "FileVersion", "3.11.1677" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2020 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "OriginalFilename", "rufus-3.11.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.11.1676" + VALUE "ProductVersion", "3.11.1677" END END BLOCK "VarFileInfo"