]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorStanislav Malyshev <stas@php.net>
Mon, 29 Jul 2019 20:20:44 +0000 (13:20 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 29 Jul 2019 20:20:44 +0000 (13:20 -0700)
* PHP-7.2:
  Fix #77919: Potential UAF in Phar RSHUTDOWN
  Update NEWS
  Fix bug #78256 (heap-buffer-overflow on exif_process_user_comment)
  Fix bug #78222 (heap-buffer-overflow on exif_scan_thumbnail)

1  2 
ext/exif/exif.c
ext/phar/phar_object.c

diff --cc ext/exif/exif.c
Simple merge
index f2e65b32f0248180c0134cdfeae6b162de057a1c,2669413fe6543a9c23690e01de93784058744164..ed5c546adc5f44cc857bf1fdadadea3d4304d479
@@@ -1990,9 -2037,9 +1990,9 @@@ static zend_object *phar_rename_archive
        char *newname = NULL, *newpath = NULL;
        zval ret, arg1;
        zend_class_entry *ce;
-       char *error;
+       char *error = NULL;
        const char *pcr_error;
 -      int ext_len = ext ? strlen(ext) : 0;
 +      size_t ext_len = ext ? strlen(ext) : 0;
        size_t new_len, oldname_len, phar_ext_len;
        phar_archive_data *pphar = NULL;
        php_stream_statbuf ssb;