svn: /php/php-src/ branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c branches/PHP_5_4/ext/pdo_firebird/firebird_statement.c
trunk/ext/pdo_firebird/firebird_statement.c
| From: | Popa Adrian Marius | Date: | Wed, 28 Dec 2011 19:58:37 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c branches/PHP_5_4/ext/pdo_firebird/firebird_statement.c trunk/ext/pdo_firebird/firebird_statement.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67373@lists.php.net to get a copy of this message | ||
mariuz Wed, 28 Dec 2011 19:58:37 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=321487
Log:
Fixed PDO_Firebird: bug 53280 segfaults if query column count is less than param count
Bug: https://bugs.php.net/53280 (Assigned) PDO_Firebird
segfaults query column count less than param count
Changed paths:
U php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c
U php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_statement.c
U php/php-src/trunk/ext/pdo_firebird/firebird_statement.c
Modified: php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c 2011-12-28 19:09:41 UTC (rev
321486)
+++ php/php-src/branches/PHP_5_3/ext/pdo_firebird/firebird_statement.c 2011-12-28 19:58:37 UTC (rev
321487)
@@ -585,6 +585,9 @@
if (param->paramno == -1) {
return 0;
}
+ if (param->is_param) {
+ break;
+ }
value = NULL;
value_len = 0;
caller_frees = 0;
Modified: php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_statement.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_statement.c 2011-12-28 19:09:41 UTC (rev
321486)
+++ php/php-src/branches/PHP_5_4/ext/pdo_firebird/firebird_statement.c 2011-12-28 19:58:37 UTC (rev
321487)
@@ -585,6 +585,9 @@
if (param->paramno == -1) {
return 0;
}
+ if (param->is_param) {
+ break;
+ }
value = NULL;
value_len = 0;
caller_frees = 0;
Modified: php/php-src/trunk/ext/pdo_firebird/firebird_statement.c
===================================================================
--- php/php-src/trunk/ext/pdo_firebird/firebird_statement.c 2011-12-28 19:09:41 UTC (rev 321486)
+++ php/php-src/trunk/ext/pdo_firebird/firebird_statement.c 2011-12-28 19:58:37 UTC (rev 321487)
@@ -585,6 +585,9 @@
if (param->paramno == -1) {
return 0;
}
+ if (param->is_param) {
+ break;
+ }
value = NULL;
value_len = 0;
caller_frees = 0;