diff options
| author | Ondřej Surý <ondrej@sury.org> | 2010-11-17 10:31:26 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2010-11-17 10:31:26 +0100 |
| commit | fdf3c647f5c09978719a5349f636404188f4b463 (patch) | |
| tree | 079e649bc5f8f96f6c5426b62c8fe05759fd3641 | |
| parent | 1556e2b0f30e9c193e0e32562b12ffa3570a714a (diff) | |
| download | php-fdf3c647f5c09978719a5349f636404188f4b463.tar.gz | |
Cherry-pick fix for bug php#53323 (pdo_firebird getAttribute() crash)
| -rw-r--r-- | debian/patches/bug53323.patch | 22 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/debian/patches/bug53323.patch b/debian/patches/bug53323.patch new file mode 100644 index 000000000..53cfd5575 --- /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 d94badfa5..da3fd3c13 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 |