diff --git a/NEWS b/NEWS index ade754593071..667656365862 100644 --- a/NEWS +++ b/NEWS @@ -20,6 +20,10 @@ PHP NEWS . Fixed bug GH-23120 (Stack overflow when comparing deeply nested DOM nodes with DOMNode::isEqualNode()). (Weilin Du) +- Exif: + . Fixed exif_read_data() allocating a HEIF meta box larger than the file + it came from. (iliaal) + - Intl: . Fixed IntlListFormatter::__construct() leaving stale global error state after successful calls. (Weilin Du) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index b30644f155cf..a2eb8259ac71 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -4415,7 +4415,7 @@ static bool exif_scan_HEIF_header(image_info_type *ImageInfo, unsigned char *buf } if (box.type == FOURCC("meta")) { limit = box.size - box_header_size; - if (limit < 36) { + if (limit < 36 || limit > ImageInfo->FileSize) { break; } data = (unsigned char *)emalloc(limit); diff --git a/ext/exif/tests/heic_meta_box_alloc.phpt b/ext/exif/tests/heic_meta_box_alloc.phpt new file mode 100644 index 000000000000..ddc9e415b830 --- /dev/null +++ b/ext/exif/tests/heic_meta_box_alloc.phpt @@ -0,0 +1,23 @@ +--TEST-- +HEIC meta box size must be bounded by the file size +--EXTENSIONS-- +exif +--INI-- +memory_limit=32M +--FILE-- + +--CLEAN-- + +--EXPECTF-- +Warning: exif_read_data(heic_meta_box_alloc.heic): Invalid HEIF file in %s on line %d +bool(false)