diff options
author | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-09 14:58:01 +0200 |
---|---|---|
committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-10-09 14:58:01 +0200 |
commit | cbf589b17c45c5b225cbd190dbe09fa278a57e60 (patch) | |
tree | d8e62fd3c662a20a0d2d86c5a0090f24d59c291e | |
parent | 736af5f6602145a267dcd9d795414a6dbffa07dc (diff) | |
parent | d6ca174d5b82b92a5f28e81e85f45c2892949cf7 (diff) | |
download | php-git-cbf589b17c45c5b225cbd190dbe09fa278a57e60.tar.gz |
Merge branch 'PHP-7.2' into PHP-7.3
-rw-r--r-- | ext/exif/exif.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 2804807e0b..e19ec7ff69 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -3267,11 +3267,6 @@ static int exif_process_IFD_TAG(image_info_type *ImageInfo, char *dir_entry, cha /*return TRUE;*/ } - if (components < 0) { - exif_error_docref("exif_read_data#error_ifd" EXIFERR_CC, ImageInfo, E_WARNING, "Process tag(x%04X=%s): Illegal components(%d)", tag, exif_get_tagname(tag, tagname, -12, tag_table), components); - return FALSE; - } - byte_count_signed = (int64_t)components * php_tiff_bytes_per_format[format]; if (byte_count_signed < 0 || (byte_count_signed > INT32_MAX)) { |