Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Various fixes to exif/heic support #19745

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nielsdos wants to merge 5 commits into php:master
base: master
Choose a base branch
Loading
from nielsdos:exif-fixes2
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 46 additions & 44 deletions ext/exif/exif.c
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4307,76 +4307,74 @@ static int exif_isobmff_parse_box(unsigned char *buf, isobmff_box_type *box)
static void exif_isobmff_parse_meta(unsigned char *data, unsigned char *end, isobmff_item_pos_type *pos)
{
isobmff_box_type box, item;
unsigned char *box_offset, *p, *p2;
unsigned char *box_offset, *p;
int header_size, exif_id = -1, version, item_count, i;

for (box_offset = data + 4; box_offset + 16 < end; box_offset += box.size) {
size_t remain;
#define CHECK(n) do { \
if (remain < n) { \
return; \
} \
} while (0)
#define ADVANCE(n) do { \
CHECK(n); \
remain -= n; \
p += n; \
} while (0)

for (box_offset = data + 4; box_offset < end - 16; box_offset += box.size) {
header_size = exif_isobmff_parse_box(box_offset, &box);
p = box_offset;
remain = end - p;

if (box.type == FOURCC("iinf")) {
p = box_offset + header_size;
if (p >= end) {
return;
}
ADVANCE(header_size);
version = p[0];
p += 4;
ADVANCE(4);
if (version < 2) {
if (p + 2 >= end) {
return;
}
item_count = php_ifd_get16u(p, 1);
p += 2;
ADVANCE(2);
item_count = php_ifd_get16u(p - 2, 1);
} else {
if (p + 4 >= end) {
return;
}
item_count = php_ifd_get32u(p, 1);
p += 4;
ADVANCE(4);
item_count = php_ifd_get32u(p - 4, 1);
}
for (i = 0; i < item_count && p + 20 < end; i++) {
for (i = 0; i < item_count && p < end - 20; i++) {
header_size = exif_isobmff_parse_box(p, &item);
if (p + header_size + 12 >= end) {
return;
}
CHECK(header_size + 12);
if (!memcmp(p + header_size + 8, "Exif", 4)) {
exif_id = php_ifd_get16u(p + header_size + 4, 1);
break;
}
p += item.size;
ADVANCE(item.size);
}
if (exif_id < 0) {
break;
}
}
else if (box.type == FOURCC("iloc")) {
p = box_offset + header_size;
if (p >= end) {
return;
}
ADVANCE(header_size);
version = p[0];
p += 6;
ADVANCE(6);
if (version < 2) {
if (p + 2 >= end) {
return;
}
item_count = php_ifd_get16u(p, 1);
p += 2;
ADVANCE(2);
item_count = php_ifd_get16u(p - 2, 1);
} else {
if (p + 4 >= end) {
return;
}
item_count = php_ifd_get32u(p, 1);
p += 4;
ADVANCE(4);
item_count = php_ifd_get32u(p - 4, 1);
}
for (i = 0, p2 = p; i < item_count && p + 16 < end; i++, p2 += 16) {
if (php_ifd_get16u(p2, 1) == exif_id) {
pos->offset = php_ifd_get32u(p2 + 8, 1);
pos->size = php_ifd_get32u(p2 + 12, 1);
for (i = 0; i < item_count && p < end - 16; i++, p += 16) {
if (php_ifd_get16u(p, 1) == exif_id) {
pos->offset = php_ifd_get32u(p + 8, 1);
pos->size = php_ifd_get32u(p + 12, 1);
break;
}
}
break;
}
}

#undef ADVANCE
#undef CHECK
}

static bool exif_scan_HEIF_header(image_info_type *ImageInfo, unsigned char *buf)
Expand All @@ -4390,7 +4388,7 @@ static bool exif_scan_HEIF_header(image_info_type *ImageInfo, unsigned char *buf
bool ret = false;

pos.size = 0;
for (offset = php_ifd_get32u(buf, 1); ImageInfo->FileSize > offset + 16; offset += box.size) {
for (offset = php_ifd_get32u(buf, 1); ImageInfo->FileSize - 16 > offset; offset += box.size) {
if ((php_stream_seek(ImageInfo->infile, offset, SEEK_SET) < 0) ||
(exif_read_from_stream_file_looped(ImageInfo->infile, (char*)buf, 16) != 16)) {
break;
Expand All @@ -4410,7 +4408,8 @@ static bool exif_scan_HEIF_header(image_info_type *ImageInfo, unsigned char *buf
exif_isobmff_parse_meta(data, data + limit, &pos);
}
if ((pos.size) &&
(ImageInfo->FileSize >= pos.offset + pos.size) &&
(pos.size < ImageInfo->FileSize) &&
(ImageInfo->FileSize - pos.size >= pos.offset) &&
(php_stream_seek(ImageInfo->infile, pos.offset + 2, SEEK_SET) >= 0)) {
if (limit >= pos.size - 2) {
limit = pos.size - 2;
Expand All @@ -4427,6 +4426,9 @@ static bool exif_scan_HEIF_header(image_info_type *ImageInfo, unsigned char *buf
efree(data);
break;
}
if (offset + box.size < offset) {
break;
}
}

return ret;
Expand Down Expand Up @@ -4497,7 +4499,7 @@ static bool exif_scan_FILE_header(image_info_type *ImageInfo)
exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Invalid TIFF file");
return false;
}
} else if ((ImageInfo->FileSize > 12) &&
} else if ((ImageInfo->FileSize > 16) &&
(!memcmp(file_header + 4, "ftyp", 4)) &&
(exif_read_from_stream_file_looped(ImageInfo->infile, (char*)(file_header + 8), 4) == 4) &&
((!memcmp(file_header + 8, "heic", 4)) || (!memcmp(file_header + 8, "heix", 4)) || (!memcmp(file_header + 8, "mif1", 4)))) {
Expand Down
27 changes: 27 additions & 0 deletions ext/exif/tests/heic_box_overflow.phpt
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
--TEST--
HEIC box overflow
--EXTENSIONS--
exif
--FILE--
<?php
$bytearray = [
0, 0, 0, 12, 'f', 't', 'y', 'p', 'h', 'e', 'i', 'c',
0, 0, 0, 1, 'x', 'y', 'z', 'w', 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff-11, 0, 0, 0, 0, 0, 0, 0
];

function convert($x) {
if (is_string($x)) return $x;
return chr($x);
}

file_put_contents(__DIR__."/heic_box_overflow", implode('', array_map(convert(...), $bytearray)));

var_dump(exif_read_data(__DIR__."/heic_box_overflow"));
?>
--CLEAN--
<?php
@unlink(__DIR__."/heic_box_overflow");
?>
--EXPECTF--
Warning: exif_read_data(heic_box_overflow): Invalid HEIF file in %s on line %d
bool(false)

AltStyle によって変換されたページ (->オリジナル) /