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

[cmp] fix some Coverity warnings

Browse source
This commit is contained in:
Pete Batard 2021-07-26 16:57:48 +01:00
parent 57af9e7106
commit 0475f4796a
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/appstore/Package.appxmanifest
View file

@ -11,7 +11,7 @@
<Identity <Identity
Name="19453.net.Rufus" Name="19453.net.Rufus"
Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740" Publisher="CN=7AC86D13-3E5A-491A-ADD5-80095C212740"
Version="3.15.1801.0" /> Version="3.15.1802.0" />
<Properties> <Properties>
<DisplayName>Rufus</DisplayName> <DisplayName>Rufus</DisplayName>

5
src/bled/decompress_vtsi.c
View file

@ -120,7 +120,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_vtsi_stream(transformer_state_t* xsta
size_t wsize = 0; size_t wsize = 0;
ssize_t retval = 0; ssize_t retval = 0;
uint64_t seg = 0; uint64_t seg = 0;
uint64_t datalen = 0; int64_t datalen = 0;
uint64_t phy_offset = 0; uint64_t phy_offset = 0;
size_t max_buflen = MAX_READ_BUF; size_t max_buflen = MAX_READ_BUF;
uint8_t* buf = NULL; uint8_t* buf = NULL;
@ -149,6 +149,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_vtsi_stream(transformer_state_t* xsta
buf = (uint8_t*)segment + footer.segment_num * sizeof(VTSI_SEGMENT); buf = (uint8_t*)segment + footer.segment_num * sizeof(VTSI_SEGMENT);
lseek(src_fd, footer.segment_offset, SEEK_SET); lseek(src_fd, footer.segment_offset, SEEK_SET);
/* coverity[tainted_data_argument] */
safe_read(src_fd, segment, footer.segment_num * sizeof(VTSI_SEGMENT)); safe_read(src_fd, segment, footer.segment_num * sizeof(VTSI_SEGMENT));
if (!check_vtsi_segment(&footer, segment)) if (!check_vtsi_segment(&footer, segment))
@ -158,7 +159,7 @@ IF_DESKTOP(long long) int FAST_FUNC unpack_vtsi_stream(transformer_state_t* xsta
lseek(src_fd, 0, SEEK_SET); lseek(src_fd, 0, SEEK_SET);
for (seg = 0; seg < footer.segment_num; seg++) { for (seg = 0; seg < footer.segment_num; seg++) {
cur_seg = segment + seg; cur_seg = segment + seg;
datalen = cur_seg->sector_num * 512; datalen = (int64_t)cur_seg->sector_num * 512;
phy_offset = cur_seg->disk_start_sector * 512; phy_offset = cur_seg->disk_start_sector * 512;
if (xstate->mem_output_size_max == 0 && xstate->dst_fd >= 0) if (xstate->mem_output_size_max == 0 && xstate->dst_fd >= 0)

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.15.1801" CAPTION "Rufus 3.15.1802"
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
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,15,1801,0 FILEVERSION 3,15,1802,0
PRODUCTVERSION 3,15,1801,0 PRODUCTVERSION 3,15,1802,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.15.1801" VALUE "FileVersion", "3.15.1802"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2021 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.15.exe" VALUE "OriginalFilename", "rufus-3.15.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.15.1801" VALUE "ProductVersion", "3.15.1802"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"