From 116ef4674714177e771575f009f3e177e983935f Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 2 Apr 2019 10:41:26 +0200 Subject: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Pointer arithmetic on void pointers is illegal (cherry picked from commit b8fdaa7c42ea8c97847193bd72d7e8716455386c) --- ext/exif/exif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 1ae2f66c90..93b18aa6ce 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; } -- cgit v1.2.1