nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[misc] fix coverity defects

Browse source 
* Also update coverity build script
This commit is contained in:
Pete Batard 2015-08-27 18:37:04 +01:00
parent cc10821361
commit 6a9a14bfb2
4 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
_coverity.cmd
View file

@ -1,4 +1,6 @@
@echo off @echo off
set COV_DIR=E:\cov-analysis-win32-7.7.0
set PATH=%PATH%;%COV_DIR%\bin
set PWD=%~dp0 set PWD=%~dp0
rmdir cov-int /s /q >NUL 2>NUL rmdir cov-int /s /q >NUL 2>NUL
del cov-int.zip >NUL 2>NUL del cov-int.zip >NUL 2>NUL

3
src/net.c
View file

@ -381,7 +381,8 @@ out:
SendMessage(hProgressDialog, UM_PROGRESS_EXIT, (WPARAM)r, 0); SendMessage(hProgressDialog, UM_PROGRESS_EXIT, (WPARAM)r, 0);
if (fd != NULL) fclose(fd); if (fd != NULL) fclose(fd);
if (!r) { if (!r) {
_unlink(file); if (file != NULL)
_unlink(file);
if (PromptOnError) { if (PromptOnError) {
PrintInfo(0, MSG_242); PrintInfo(0, MSG_242);
SetLastError(error_code); SetLastError(error_code);

10
src/rufus.rc
View file

@ -32,7 +32,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376 IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Rufus 2.3.705" CAPTION "Rufus 2.3.706"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0 FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8 LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -317,8 +317,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,3,705,0 FILEVERSION 2,3,706,0
PRODUCTVERSION 2,3,705,0 PRODUCTVERSION 2,3,706,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -335,13 +335,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.3.705" VALUE "FileVersion", "2.3.706"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2015 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.3.705" VALUE "ProductVersion", "2.3.706"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

5
src/stdlg.c
View file

@ -1612,8 +1612,11 @@ LPCDLGTEMPLATE GetDialogTemplate(int Dialog_ID)
WCHAR* wBuf; WCHAR* wBuf;
LPCDLGTEMPLATE rcTemplate = (LPCDLGTEMPLATE) GetResource(hMainInstance, MAKEINTRESOURCEA(Dialog_ID), LPCDLGTEMPLATE rcTemplate = (LPCDLGTEMPLATE) GetResource(hMainInstance, MAKEINTRESOURCEA(Dialog_ID),
_RT_DIALOG, get_name_from_id(Dialog_ID), &size, TRUE); _RT_DIALOG, get_name_from_id(Dialog_ID), &size, TRUE);
if ((size == 0) || (rcTemplate == NULL))
if ((size == 0) || (rcTemplate == NULL)) {
safe_free(rcTemplate);
return NULL; return NULL;
}
if (right_to_left_mode) { if (right_to_left_mode) {
// Add the RTL styles into our RC copy, so that we don't have to multiply dialog definitions in the RC // Add the RTL styles into our RC copy, so that we don't have to multiply dialog definitions in the RC
dwBuf = (DWORD*)rcTemplate; dwBuf = (DWORD*)rcTemplate;