svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c branches/PHP_5_3/NEWS
branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c trunk/ext/pdo_firebird/firebird_driver.c

felipe Tue, 16 Nov 2010 21:02:14 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=305416 Log: - Fixed bug #53323 (pdo_firebird getAttribute() crash) patch by: preeves at ibphoenix dot com Bug: http://bugs.php.net/53323 (Open) Some calls to pdo_firebird getAttribute crash Changed paths: U php/php-src/branches/PHP_5_2/NEWS U php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c U php/php-src/trunk/ext/pdo_firebird/firebird_driver.c Modified: php/php-src/branches/PHP_5_2/NEWS =================================================================== --- php/php-src/branches/PHP_5_2/NEWS 2010-11-16 20:50:29 UTC (rev 305415) +++ php/php-src/branches/PHP_5_2/NEWS 2010-11-16 21:02:14 UTC (rev 305416) @@ -8,6 +8,8 @@ - Fixed NULL pointer dereference in ZipArchive::getArchiveComment. (CVE-2010-3709). (Maksymilian Arciemowicz) +- Fixed bug #53323 (pdo_firebird getAttribute() crash). + (preeves at ibphoenix dot com) - Fixed bug #52929 (Segfault in filter_var with FILTER_VALIDATE_EMAIL with large amount of data). (CVE-2010-3709). (Adam) - Fixed bug #52879 (Objects unreferenced in __get, __set, __isset or __unset Modified: php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c =================================================================== --- php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c 2010-11-16 20:50:29 UTC (rev 305415) +++ php/php-src/branches/PHP_5_2/ext/pdo_firebird/firebird_driver.c 2010-11-16 21:02:14 UTC (rev 305416) @@ -508,7 +508,7 @@ 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); @@ -551,6 +551,10 @@ ZVAL_STRING(val,tmp,1); return 1; } + + case PDO_ATTR_FETCH_TABLE_NAMES: + ZVAL_BOOL(val, H->fetch_table_names); + return 1; } return 0; } Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2010-11-16 20:50:29 UTC (rev 305415) +++ php/php-src/branches/PHP_5_3/NEWS 2010-11-16 21:02:14 UTC (rev 305416) @@ -64,6 +64,8 @@ - Fixed the filter extension accepting IPv4 octets with a leading 0 as that belongs to the unsupported "dotted octal" representation. (Gustavo) +- Fixed bug #53323 (pdo_firebird getAttribute() crash). + (preeves at ibphoenix dot com) - Fixed bug #53305 (E_NOTICE when defining a constant starts with __COMPILER_HALT_OFFSET__). (Felipe) - Fixed bug #53297 (gettimeofday implementation in php/win32/time.c can return Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c 2010-11-16 20:50:29 UTC (rev 305415) +++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_driver.c 2010-11-16 21:02:14 UTC (rev 305416) @@ -547,7 +547,7 @@ 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 @@ ZVAL_STRING(val,tmp,1); return 1; } + + case PDO_ATTR_FETCH_TABLE_NAMES: + ZVAL_BOOL(val, H->fetch_table_names); + return 1; } return 0; } Modified: php/php-src/trunk/ext/pdo_firebird/firebird_driver.c =================================================================== --- php/php-src/trunk/ext/pdo_firebird/firebird_driver.c 2010-11-16 20:50:29 UTC (rev 305415) +++ php/php-src/trunk/ext/pdo_firebird/firebird_driver.c 2010-11-16 21:02:14 UTC (rev 305416) @@ -547,7 +547,7 @@ 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 @@ ZVAL_STRING(val,tmp,1); return 1; } + + case PDO_ATTR_FETCH_TABLE_NAMES: + ZVAL_BOOL(val, H->fetch_table_names); + return 1; } return 0; }