com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/exif/exif.c

From: Date: Tue, 02 Apr 2019 08:47:34 +0000
Subject: com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/exif/exif.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-105469@lists.php.net to get a copy of this message
Commit: 116ef4674714177e771575f009f3e177e983935f Author: Christoph M. Becker <cmbecker69@gmx.de> Tue, 2 Apr 2019 10:41:26 +0200 Parents: f6670180e26bf22f388179ea66b6ccff9d0363a4 Branches: PHP-7.3.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=116ef4674714177e771575f009f3e177e983935f Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Pointer arithmetic on void pointers is illegal (cherry picked from commit b8fdaa7c42ea8c97847193bd72d7e8716455386c) Changed paths: M ext/exif/exif.c Diff: diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 1ae2f66..93b18aa 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -2123,9 +2123,9 @@ static void exif_iif_add_value(image_info_type *image_info, int section_index, c } else { info_value = &info_data->value; } - vptr_end = value+value_len; + vptr_end = (char *) value + value_len; for (idex=0,vptr=value; idex<(size_t)length; idex++,vptr=(char *) vptr + php_tiff_bytes_per_format[format]) { - if (vptr_end - vptr < php_tiff_bytes_per_format[format]) { + if ((char *) vptr_end - (char *) vptr < php_tiff_bytes_per_format[format]) { exif_error_docref("exif_iif_add_value" EXIFERR_CC, image_info, E_WARNING, "Value too short"); break; }

« previous php.cvs (#105469) next »