third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Restoring i < dataLength trigraph that I should not have removed.

Browse Source
This commit is contained in:
clanmills 2021-03-07 20:25:04 +00:00
parent 2f2dd7d56c
commit 21c610e952
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/futils.cpp
View File

@ -155,13 +155,11 @@ namespace Exiv2 {
int rc = result && data_buf && output_length < resultSize ? 1 : 0;
if ( rc ) {
const unsigned char* data = (const unsigned char*) data_buf ;
::memset(result,0,resultSize);
for (size_t i = 0, j = 0 ; i < dataLength;) {
uint32_t octet_a = data[i++] ;
uint32_t octet_b = data[i++] ;
uint32_t octet_c = data[i++] ;
uint32_t octet_a = i < dataLength ? data[i++] : 0 ;
uint32_t octet_b = i < dataLength ? data[i++] : 0 ;
uint32_t octet_c = i < dataLength ? data[i++] : 0 ;
uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;