From: Felipe Pena <felipe@php.net>
Date: Wed, 18 Aug 2010 01:59:37 +0000 (+0000)
Subject: - Improved fix for bug #52573
X-Git-Tag: php-5.4.0alpha1~191^2~1080
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3028b9226459d9f111b2fecca76bb46d1ac023f;p=php

- Improved fix for bug #52573
---

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 942b284317..66fdec13f1 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -2922,7 +2922,8 @@ static zend_bool zend_do_perform_implementation_check(const zend_function *fe, c
 		return 0;
 	}
 
-	if (proto->common.pass_rest_by_reference
+	if (fe->common.type != ZEND_USER_FUNCTION
+		&& proto->common.pass_rest_by_reference
 		&& !fe->common.pass_rest_by_reference) {
 		return 0;
 	}
diff --git a/ext/spl/spl_directory.c b/ext/spl/spl_directory.c
index fe3262ba42..b6970f2ddb 100755
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@ -2586,7 +2586,7 @@ 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_END_ARG_INFO()
 
diff --git a/ext/spl/tests/bug52573.phpt b/ext/spl/tests/bug52573.phpt
index 17f2984dfb..54587fae1d 100644
--- a/ext/spl/tests/bug52573.phpt
+++ b/ext/spl/tests/bug52573.phpt
@@ -1,12 +1,18 @@
 --TEST--
 Bug #52573 (SplFileObject::fscanf Segmentation fault)
 --FILE--
-<?php
+<?php // test
 
 $result = null;
 $f = new SplFileObject(__FILE__, 'r');
-$f->fscanf('<?php // %s', $result);
-
+var_dump($f->fscanf('<?php // %s', $result));
+var_dump($result);
+var_dump($f->fscanf('<?php // %s'));
 ?>
 --EXPECTF--
-Warning: Parameter 3 to fscanf() expected to be a reference, value given in %s on line 5
+int(1)
+string(4) "test"
+array(1) {
+  [0]=>
+  NULL
+}