openharmony/third_party_libexif
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_libexif.git synced 2026-07-21 00:26:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

1127 exif offset check fix

Browse Source 
Signed-off-by: duanhan <duanhan1@huawei.com>
This commit is contained in:
duanhan
2024-11-27 17:25:28 +08:00
parent ef734663cb
commit e1f434d40a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libexif/huawei/exif-mnote-data-huawei.c
+3 -2
View File
@@ -250,7 +250,8 @@ exif_mnote_data_huawei_load_data (ExifMnoteData *ne, const unsigned char *buf, u
"ExifMnoteDataHuawei", "MakerNote data is abnormal.");
return -1;
}
const unsigned char *ifd_data = buf + *cur_ifd_data_offset;
unsigned int current_offset = *cur_ifd_data_offset;
const unsigned char *ifd_data = buf + current_offset;
ExifShort count = exif_get_short (ifd_data, n->order);
if (count > 100) {
exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA, "ExifMnoteHuawei", "Too much tags (%d) in Huawei MakerNote", count);
@@ -268,7 +269,7 @@ exif_mnote_data_huawei_load_data (ExifMnoteData *ne, const unsigned char *buf, u
/* Parse the entries */
tcount = 0;
for (int i = 0; i < count; i++, offset += 12) {
if (CHECKOVERFLOW(*cur_ifd_data_offset + offset, buf_size, 12)) {
if (CHECKOVERFLOW(current_offset + offset, buf_size, 12)) {
exif_log (ne->log, EXIF_LOG_CODE_CORRUPT_DATA,
"ExifMnoteDataHuawei", "Short MakerNote");
break;