[Pkg-php-commits] [php/debian-sid] Cherry-pick fix for bug php#52573 (SplFileObject::fscanf Segmentation fault)

[Ondřej Surý]

---
 debian/patches/bug52573.patch |   15 +++++++++++++++
 debian/patches/series         |    1 +
 2 files changed, 16 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/bug52573.patch

diff --git a/debian/patches/bug52573.patch b/debian/patches/bug52573.patch
new file mode 100644
index 0000000..e89b496
--- /dev/null
+++ b/debian/patches/bug52573.patch
@@ -0,0 +1,15 @@
+--- a/ext/spl/spl_directory.c	2010/08/10 21:52:14	302084
++++ b/ext/spl/spl_directory.c	2010/08/10 22:37:24	302085
+@@ -1862,7 +1862,11 @@
+ 
+ 	result = zend_call_function(&fci, &fcic TSRMLS_CC);
+ 	
+-	ZVAL_ZVAL(return_value, retval, 1, 1);
++	if (result == FAILURE) {
++		RETVAL_FALSE;
++	} else {
++		ZVAL_ZVAL(return_value, retval, 1, 1);
++	}
+ 
+ 	efree(params);
+ 	return result;
diff --git a/debian/patches/series b/debian/patches/series
index da96d06..3961548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -58,3 +58,4 @@ CVE-2010-3710.patch
 CVE-2010-3709.patch
 CVE-2010-3870.patch
 CVE-2010-4156.patch
+bug52573.patch
-- 
1.7.1