[Pkg-php-commits] [php/debian-sid] Cherry pick fix for leask and crash when passing the callback as a variable

Ondřej Surý ondrej at sury.org
Wed Jan 5 10:06:14 UTC 2011


---
 ...bug-when-passing-the-callback-as-variable.patch |   11 +++++++++++
 debian/patches/series                              |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/fix-leaks-and-crash-bug-when-passing-the-callback-as-variable.patch

diff --git a/debian/patches/fix-leaks-and-crash-bug-when-passing-the-callback-as-variable.patch b/debian/patches/fix-leaks-and-crash-bug-when-passing-the-callback-as-variable.patch
new file mode 100644
index 0000000..5a96670
--- /dev/null
+++ b/debian/patches/fix-leaks-and-crash-bug-when-passing-the-callback-as-variable.patch
@@ -0,0 +1,11 @@
+--- a/main/output.c
++++ b/main/output.c
+@@ -745,7 +745,7 @@ PHP_FUNCTION(ob_start)
+ 	long chunk_size=0;
+ 	zend_bool erase=1;
+ 
+-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|zlb", &output_handler, &chunk_size, &erase) == FAILURE) {
++	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z/lb", &output_handler, &chunk_size, &erase) == FAILURE) {
+ 		return;
+ 	}
+ 
diff --git a/debian/patches/series b/debian/patches/series
index fa8cd3c..fb05d2f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -82,3 +82,4 @@ fix-crash-with-entity-declarations-in-simplexml.patch
 fix-for-NULL-deref-in-zend_language_scanner.patch
 fix-integer-overflow-in-SdnToJulian.patch
 fix-leak-and-possible-crash-introduced-by-the-null-poisoning-patch.patch
+fix-leaks-and-crash-bug-when-passing-the-callback-as-variable.patch
-- 
1.7.1





More information about the Pkg-php-commits mailing list