[Pkg-php-commits] [php/debian-sid] Cherry-pick fix for bug php#53323 (pdo_firebird getAttribute() crash)

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


---
 debian/patches/bug53323.patch |   22 ++++++++++++++++++++++
 debian/patches/series         |    1 +
 2 files changed, 23 insertions(+), 0 deletions(-)
 create mode 100644 debian/patches/bug53323.patch

diff --git a/debian/patches/bug53323.patch b/debian/patches/bug53323.patch
new file mode 100644
index 0000000..53cfd55
--- /dev/null
+++ b/debian/patches/bug53323.patch
@@ -0,0 +1,22 @@
+--- a/ext/pdo_firebird/firebird_driver.c
++++ b/ext/pdo_firebird/firebird_driver.c
+@@ -547,7 +547,7 @@ static int firebird_handle_get_attribute
+ 	pdo_firebird_db_handle *H = (pdo_firebird_db_handle *)dbh->driver_data;
+ 
+ 	switch (attr) {
+-		char tmp[200];
++		char tmp[512];
+ 		
+ 		case PDO_ATTR_AUTOCOMMIT:
+ 			ZVAL_LONG(val,dbh->auto_commit);
+@@ -590,6 +590,10 @@ static int firebird_handle_get_attribute
+ 				ZVAL_STRING(val,tmp,1);
+ 				return 1;
+ 			}
++			
++		case PDO_ATTR_FETCH_TABLE_NAMES:
++			ZVAL_BOOL(val, H->fetch_table_names);
++			return 1;
+ 	}
+ 	return 0;
+ }       
diff --git a/debian/patches/series b/debian/patches/series
index d94badf..da3fd3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -68,3 +68,4 @@ CVE-2010-3436.patch
 bug52947.patch
 fix_crash_in_GC.patch
 bug53070.patch
+bug53323.patch
-- 
1.7.1





More information about the Pkg-php-commits mailing list