mirrors
/
rufus
mirror of https://github.com/pbatard/rufus.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[misc] silence more Coverity false positives 

* "Show me static analysis framework that only triples my work and I will kiss its feet."
This commit is contained in:
Pete Batard 2019-08-06 17:02:28 +01:00
parent 84427d12dd
commit 4c8dd29935
No known key found for this signature in database
GPG Key ID: 38E0CF5E69EDD671
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/icon.c
View File

@ -177,7 +177,9 @@ BOOL SetAutorun(const char* path)
GetWindowTextW(hLabel, wlabel, ARRAYSIZE(wlabel)); GetWindowTextW(hLabel, wlabel, ARRAYSIZE(wlabel));
GetWindowTextW(hMainDialog, wRufusVersion, ARRAYSIZE(wRufusVersion)); GetWindowTextW(hMainDialog, wRufusVersion, ARRAYSIZE(wRufusVersion));
// coverity[invalid_type]
fwprintf_s(fd, L"; Created by %s\n; " LTEXT(RUFUS_URL) L"\n", wRufusVersion); fwprintf_s(fd, L"; Created by %s\n; " LTEXT(RUFUS_URL) L"\n", wRufusVersion);
// coverity[invalid_type]
fwprintf_s(fd, L"[autorun]\nicon = autorun.ico\nlabel = %s\n", wlabel); fwprintf_s(fd, L"[autorun]\nicon = autorun.ico\nlabel = %s\n", wlabel);
fclose(fd); fclose(fd);
uprintf("Created: %s", filename); uprintf("Created: %s", filename);

4
src/parser.c
View File

@ -782,12 +782,14 @@ char* set_token_data_file(const char* token, const char* data, const char* filen
fputws(buf, fd_out); fputws(buf, fd_out);
// Now output the new data // Now output the new data
// coverity[invalid_type]
fwprintf_s(fd_out, L"%s\n", wdata); fwprintf_s(fd_out, L"%s\n", wdata);
ret = (char*)data; ret = (char*)data;
} }
if (ret == NULL) { if (ret == NULL) {
// Didn't find an existing token => append it // Didn't find an existing token => append it
// coverity[invalid_type]
fwprintf_s(fd_out, L"%s = %s\n", wtoken, wdata); fwprintf_s(fd_out, L"%s = %s\n", wtoken, wdata);
ret = (char*)data; ret = (char*)data;
} }
@ -1039,6 +1041,7 @@ char* insert_section_data(const char* filename, const char* section, const char*
// Section was found, output it // Section was found, output it
fputws(buf, fd_out); fputws(buf, fd_out);
// Now output the new data // Now output the new data
// coverity[invalid_type]
fwprintf_s(fd_out, L"%s\n", wdata); fwprintf_s(fd_out, L"%s\n", wdata);
ret = (char*)data; ret = (char*)data;
} }
@ -1194,6 +1197,7 @@ char* replace_in_token_data(const char* filename, const char* token, const char*
i = (torep-buf) + wcslen(wsrc); i = (torep-buf) + wcslen(wsrc);
*torep = 0; *torep = 0;
// coverity[invalid_type]
fwprintf_s(fd_out, L"%s%s%s", buf, wrep, &buf[i]); fwprintf_s(fd_out, L"%s%s%s", buf, wrep, &buf[i]);
ret = (char*)rep; ret = (char*)rep;
} }

10
src/rufus.rc
View File

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
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
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.7.1556" CAPTION "Rufus 3.7.1557"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -394,8 +394,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,7,1556,0 FILEVERSION 3,7,1557,0
PRODUCTVERSION 3,7,1556,0 PRODUCTVERSION 3,7,1557,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -413,13 +413,13 @@ BEGIN
VALUE "Comments", "https://akeo.ie" VALUE "Comments", "https://akeo.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.7.1556" VALUE "FileVersion", "3.7.1557"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2019 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus-3.7.exe" VALUE "OriginalFilename", "rufus-3.7.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.7.1556" VALUE "ProductVersion", "3.7.1557"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"