Commit 7dcdc1a

committed

exif/heic: Prevent overflow when computing meta bounds

1 parent df6aeaa commit 7dcdc1aCopy full SHA for 7dcdc1a

File tree

-1

lines changed

-1

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4408,7 +4408,8 @@ static bool exif_scan_HEIF_header(image_info_type ImageInfo, unsigned char buf`
`4408`	`4408`	`exif_isobmff_parse_meta(data, data + limit, &pos);`
`4409`	`4409`	`}`
`4410`	`4410`	`if ((pos.size) &&`
`4411`		`- (ImageInfo->FileSize >= pos.offset + pos.size) &&`
	`4411`	`+ (pos.size < ImageInfo->FileSize) &&`
	`4412`	`+ (ImageInfo->FileSize - pos.size >= pos.offset) &&`
`4412`	`4413`	`(php_stream_seek(ImageInfo->infile, pos.offset + 2, SEEK_SET) >= 0)) {`
`4413`	`4414`	`if (limit >= pos.size - 2) {`
`4414`	`4415`	`limit = pos.size - 2;`

Comments

(0)