From 249d3e16fb4cea02f7cee904142b9ea19b2a9c35 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Thu, 22 Nov 2012 13:18:30 +0000 Subject: [PATCH] [iso] fix possible crash when accessing root UDF files * See http://lists.gnu.org/archive/html/libcdio-devel/2012-11/msg00013.html and http://cgit.freedesktop.org/~teuf/cdio/commit/?id=6c0251d145e44b7cdfeb9767c615646fb8f51320 --- src/libcdio/udf/udf_fs.c | 3 ++- src/rufus.rc | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/libcdio/udf/udf_fs.c b/src/libcdio/udf/udf_fs.c index c2787e76..c4eb2bb6 100644 --- a/src/libcdio/udf/udf_fs.c +++ b/src/libcdio/udf/udf_fs.c @@ -257,7 +257,8 @@ udf_fopen(udf_dirent_t *p_udf_root, const char *psz_name) p_udf_root->psz_name, p_udf_root->b_dir, p_udf_root->b_parent); p_udf_file = udf_ff_traverse(p_udf_dirent, psz_token); - udf_dirent_free(p_udf_dirent); + if (p_udf_file != p_udf_dirent) + udf_dirent_free(p_udf_dirent); } else if ( 0 == strncmp("/", psz_name, sizeof("/")) ) { return udf_new_dirent(&p_udf_root->fe, p_udf_root->p_udf, diff --git a/src/rufus.rc b/src/rufus.rc index 7593c56c..2fbf41a5 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.2.1.196" +CAPTION "Rufus v1.2.1.197" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -77,7 +77,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.2.1 (Build 196)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.2.1 (Build 197)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP CONTROL "",IDC_ABOUT_COPYRIGHTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_VSCROLL,46,107,235,63,WS_EX_STATICEDGE LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -237,8 +237,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,196 - PRODUCTVERSION 1,2,1,196 + FILEVERSION 1,2,1,197 + PRODUCTVERSION 1,2,1,197 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -255,13 +255,13 @@ BEGIN BEGIN VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.2.1.196" + VALUE "FileVersion", "1.2.1.197" 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.2.1.196" + VALUE "ProductVersion", "1.2.1.197" END END BLOCK "VarFileInfo"