From: Jani Taskinen <jani@php.net>
Date: Thu, 23 Jul 2009 14:42:46 +0000 (+0000)
Subject: - Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference)
X-Git-Tag: php-5.2.11RC1~120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e02a2ac8e8e20684d497bf3f568d4370433028e0;p=php

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

diff --git a/NEWS b/NEWS
index cfb9f25833..fa59891672 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,8 @@ PHP                                                                        NEWS
 - Fixed regression in cURL extension that prevented flush of data to output
   defined as a file handle. (Ilia)
 
+- Fixed bug #49032 (SplFileObject::fscanf() variables passed by reference).
+  (Jani)
 - Fixed bug #48980 (Crash when compiling with pdo_firebird). (Felipe)
 - Fixed bug #48962 (cURL does not upload files with specified filename).
   (Ilia)
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index 5ef77a43cd..8370c09ba6 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2264,8 +2264,9 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_file_object_fgetss, 0, 0, 0)
 ZEND_END_ARG_INFO()
 
 static
-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()
 
 static