p/fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix 32-bit build warnings

Browse Source
This commit is contained in:
Přemysl Eric Janouch
2023-06-23 13:34:59 +02:00
parent 2dc4e9c13b
commit 4f57070e27
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
fiv-io.c
View File

@@ -1263,7 +1263,7 @@ parse_mpf_index_ifd(struct tiffer *T)
static bool
parse_mpf(
GPtrArray *individuals, const uint8_t *mpf, size_t len, const uint8_t *end)
GPtrArray *individuals, const uint8_t *mpf, size_t len, size_t total_len)
{
struct tiffer T;
if (!tiffer_init(&T, mpf, len) || !tiffer_next_ifd(&T))
@@ -1274,7 +1274,7 @@ parse_mpf(
uint32_t *offsets = parse_mpf_index_ifd(&T);
if (offsets) {
for (const uint32_t *o = offsets; *o; o++)
if (*o <= end - mpf)
if (*o <= total_len)
g_ptr_array_add(individuals, (gpointer) mpf + *o);
free(offsets);
}
@@ -1378,7 +1378,7 @@ parse_jpeg_metadata(const char *data, size_t len, struct jpeg_metadata *meta)
if (meta->mpf && marker == APP2 && p - payload >= 8 &&
!memcmp(payload, "MPF\0", 4) && !meta->mpf->len) {
payload += 4;
parse_mpf(meta->mpf, payload, p - payload, end);
parse_mpf(meta->mpf, payload, p - payload, end - payload);
}
// TODO(p): Extract the main XMP segment.