diff --git a/src/.msvc/iso.vcxproj b/src/.msvc/iso.vcxproj index 1a030023..76b71d6e 100644 --- a/src/.msvc/iso.vcxproj +++ b/src/.msvc/iso.vcxproj @@ -77,7 +77,7 @@ - ISO_TEST;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) @@ -100,7 +100,7 @@ ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) - ISO_TEST;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_CRT_SECURE_NO_WARNINGS;_CRTDBG_MAP_ALLOC;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 ProgramDatabase @@ -119,7 +119,7 @@ - ISO_TEST;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) @@ -141,7 +141,7 @@ X64 - ISO_TEST;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) + ISO_TEST;_CRT_SECURE_NO_WARNINGS;HAVE_CONFIG_H;_OFF_T_DEFINED;_off_t=__int64;off_t=_off_t;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 ..\msvc-missing;..\libcdio;%(AdditionalIncludeDirectories) diff --git a/src/libcdio/iso9660/iso9660_fs.c b/src/libcdio/iso9660/iso9660_fs.c index a49bae15..ff9dddff 100644 --- a/src/libcdio/iso9660/iso9660_fs.c +++ b/src/libcdio/iso9660/iso9660_fs.c @@ -1431,8 +1431,8 @@ find_lsn_recurse (void *p_image, iso9660_readdir_t iso9660_readdir, } if (statbuf->lsn == lsn) { - len = sizeof(iso9660_stat_t)+strlen(statbuf->filename)+1; iso9660_stat_t *ret_stat = calloc(1, len); + len = sizeof(iso9660_stat_t)+strlen(statbuf->filename)+1; if (!ret_stat) { cdio_warn("Couldn't calloc(1, %d)", len); diff --git a/src/rufus.rc b/src/rufus.rc index 80260dae..66c0dd59 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.7.147" +CAPTION "Rufus v1.0.7.148" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -70,7 +70,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.0.7 (Build 147)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.7 (Build 148)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -208,8 +208,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,7,147 - PRODUCTVERSION 1,0,7,147 + FILEVERSION 1,0,7,148 + PRODUCTVERSION 1,0,7,148 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -226,13 +226,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.7.147" + VALUE "FileVersion", "1.0.7.148" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.0.7.147" + VALUE "ProductVersion", "1.0.7.148" END END BLOCK "VarFileInfo"