iliaa Tue Feb 26 00:14:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo pdo_stmt.c
/php-src/ext/pdo_pgsql pgsql_statement.c
Log:
MFB: Better fix for bug #44189
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.33&r2=1.118.2.38.2.34&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.33
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.34
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.33 Sun Feb 24 16:09:05 2008
+++ php-src/ext/pdo/pdo_stmt.c Tue Feb 26 00:14:04 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.33 2008/02/24 16:09:05 iliaa Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.34 2008/02/26 00:14:04 iliaa Exp $ */
/* The PDO Statement Handle Class */
@@ -166,10 +166,6 @@
ht = stmt->bound_params;
- if (ht && !stmt->bound_param_map) {
- return 0;
- }
-
iterate:
if (ht) {
zend_hash_internal_pointer_reset(ht);
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_pgsql/pgsql_statement.c?r1=1.31.2.12.2.10&r2=1.31.2.12.2.11&diff_format=u
Index: php-src/ext/pdo_pgsql/pgsql_statement.c
diff -u php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.10
php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.11
--- php-src/ext/pdo_pgsql/pgsql_statement.c:1.31.2.12.2.10 Mon Dec 31
07:20:10 2007
+++ php-src/ext/pdo_pgsql/pgsql_statement.c Tue Feb 26 00:14:04 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pgsql_statement.c,v 1.31.2.12.2.10 2007/12/31 07:20:10 sebastian Exp $
*/
+/* $Id: pgsql_statement.c,v 1.31.2.12.2.11 2008/02/26 00:14:04 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -250,6 +250,9 @@
return 1;
case PDO_PARAM_EVT_EXEC_PRE:
+ if (!stmt->bound_param_map) {
+ return 0;
+ }
if (!S->param_values) {
S->param_values = ecalloc(
zend_hash_num_elements(stmt->bound_param_map),
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
