From: Nikita Popov <nikita.ppv@gmail.com>
Date: Fri, 19 Jun 2020 08:48:34 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b461e6b074f42aa786feca9a7b238b32dd75a7cc;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed bug #79710
---

b461e6b074f42aa786feca9a7b238b32dd75a7cc
diff --cc ext/spl/spl_directory.c
index f30d7fcf7f,6fec6d2e25..fa33c022b0
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@@ -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);