[Pkg-php-commits] [php/debian-sid] Cherry-pick fix for bug php#52487 (PDO::FETCH_INTO leaks memory)

Ondřej Surý ondrej at sury.org
Wed Nov 17 09:48:09 UTC 2010


---
 debian/patches/bug52487.patch |   11 +++++++++++
 debian/patches/series         |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/bug52487.patch

diff --git a/debian/patches/bug52487.patch b/debian/patches/bug52487.patch
new file mode 100644
index 0000000..ec7eb3f
--- /dev/null
+++ b/debian/patches/bug52487.patch
@@ -0,0 +1,11 @@
+--- a/ext/pdo/pdo_stmt.c	2010/07/29 22:07:00	301705
++++ b/ext/pdo/pdo_stmt.c	2010/07/29 23:38:55	301706
+@@ -1887,7 +1887,7 @@
+ 	switch (stmt->default_fetch_type) {
+ 		case PDO_FETCH_INTO:
+ 			if (stmt->fetch.into) {
+-				Z_DELREF_P(stmt->fetch.into);
++				zval_ptr_dtor(&stmt->fetch.into);
+ 				stmt->fetch.into = NULL;
+ 			}
+ 			break;
diff --git a/debian/patches/series b/debian/patches/series
index 3961548..b014de1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -59,3 +59,4 @@ CVE-2010-3709.patch
 CVE-2010-3870.patch
 CVE-2010-4156.patch
 bug52573.patch
+bug52487.patch
-- 
1.7.1





More information about the Pkg-php-commits mailing list