]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 19 Jun 2020 08:48:34 +0000 (10:48 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 19 Jun 2020 08:48:34 +0000 (10:48 +0200)
* PHP-7.4:
  Fixed bug #79710

1  2 
ext/spl/spl_directory.c

index f30d7fcf7f78f11bac9bf53ce106a14fafbd2915,6fec6d2e25d327877249bd7f1cb39f6c2cad8820..fa33c022b0429f59036d675ec8b1684f085acb8f
@@@ -1927,7 -2078,7 +1928,7 @@@ static int spl_filesystem_file_call(spl
  {
        zend_fcall_info fci;
        zend_fcall_info_cache fcic;
-       zval *zresource_ptr = &intern->u.file.zresource;
 -      zval *zresource_ptr = &intern->u.file.zresource, *params, retval;
++      zval *zresource_ptr = &intern->u.file.zresource, *params;
        int result;
        int num_args = pass_num_args + (arg2 ? 2 : 1);