Skip to content

Commit f57dcd7

Browse files
committed
review: p[0] OOB
1 parent d230ad8 commit f57dcd7

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

ext/exif/exif.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4333,9 +4333,8 @@ static void exif_isobmff_parse_meta(unsigned char *data, unsigned char *end, iso
43334333
remain = end - p;
43344334

43354335
if (box.type == FOURCC("iinf")) {
4336-
ADVANCE(header_size);
4337-
version = p[0];
4338-
ADVANCE(4);
4336+
ADVANCE(header_size + 4);
4337+
version = p[-4];
43394338
if (version < 2) {
43404339
ADVANCE(2);
43414340
item_count = php_ifd_get16u(p - 2, 1);
@@ -4360,9 +4359,8 @@ static void exif_isobmff_parse_meta(unsigned char *data, unsigned char *end, iso
43604359
}
43614360
}
43624361
else if (box.type == FOURCC("iloc")) {
4363-
ADVANCE(header_size);
4364-
version = p[0];
4365-
ADVANCE(6);
4362+
ADVANCE(header_size + 6);
4363+
version = p[-6];
43664364
if (version < 2) {
43674365
ADVANCE(2);
43684366
item_count = php_ifd_get16u(p - 2, 1);

0 commit comments

Comments
 (0)