liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'de5f92937857cccc45080c59c6236561416e5ece' into libraw-copylib

Browse Source 
Upgrade LibRaw to 0.21.2.
This commit is contained in:
Lawrence Lee
2023-12-31 12:52:34 -08:00
parent ebf5b422be de5f929378
commit 88f9978e1f
19 changed files with 150 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/libraw/src/metadata/fuji.cpp
View File

@@ -132,7 +132,7 @@ void LibRaw::parseAdobeRAFMakernote()
}
#define CHECKSPACE(s) \
if (posPrivateMknBuf + (s) > PrivateMknLength) \
if (INT64(posPrivateMknBuf) + INT64(s) > INT64(PrivateMknLength)) \
{ \
free(PrivateMknBuf); \
return; \
@@ -209,7 +209,7 @@ void LibRaw::parseAdobeRAFMakernote()
PrivateOrder = sget2(PrivateMknBuf);
unsigned s, l;
s = ifd_start = sget4(PrivateMknBuf +2)+6;
CHECKSPACE(ifd_start+4);
CHECKSPACE(INT64(ifd_start)+4LL);
l = ifd_len = sget4(PrivateMknBuf +ifd_start);
CHECKSPACE_ABS3(ifd_start, ifd_len, 4);
@@ -767,7 +767,7 @@ void LibRaw::parseAdobeRAFMakernote()
if (wb_section_offset)
{
CHECKSPACE(wb_section_offset + 12);
CHECKSPACE(INT64(wb_section_offset) + 12LL);
}
if (wb_section_offset &&