- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference)

diff --git a/NEWS b/NEWS
index b18f7661b750079b4dda3d189b704015f8d4bb7d..32e44d80b318934f391afb15fb757cc96feb1c54 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Fixed open_basedir circumvention for mail.log. (Maksymilian Arciemowicz,
   Stas)
 
+- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference).
+  (Jani)
 - Fixed bug #49012 (phar tar signature algorithm reports as Unknown (0) in
   getSignature() call). (Greg)
 - Fixed bug #49020 (phar misinterprets ustar long filename standard).

diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index c4ab0ed51d355fc02bc11f5689f404bd07fa0eb6..f6b072b3dc8b3a2c11aae6eb5f8316a4b41c2fd3 100755 (executable)
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2567,8 +2567,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0)
        ZEND_ARG_INFO(0, allowable_tags)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 0, 0, 1) 
+ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fscanf, 1, 0, 1) 
        ZEND_ARG_INFO(0, format)
+       ZEND_ARG_INFO(1, ...)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fwrite, 0, 0, 1)