summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2008-02-26 00:14:04 +0000
committerIlia Alshanetsky <iliaa@php.net>2008-02-26 00:14:04 +0000
commit86647d648ffd70a9c1ff8bab47302a6e66d2f468 (patch)
treed8c8165512c53e0843a5b165cb8b9a6a405b2c2e
parent8bdaeafc23248c0ac33d3bb21dce299467eb967e (diff)
downloadphp-git-86647d648ffd70a9c1ff8bab47302a6e66d2f468.tar.gz
MFB: Better fix for bug #44189
-rwxr-xr-xext/pdo/pdo_stmt.c4
-rw-r--r--ext/pdo_pgsql/pgsql_statement.c3
2 files changed, 3 insertions, 4 deletions
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 0022631669..eac65790cf 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -166,10 +166,6 @@ static int dispatch_param_event(pdo_stmt_t *stmt, enum pdo_param_event event_typ
ht = stmt->bound_params;
- if (ht && !stmt->bound_param_map) {
- return 0;
- }
-
iterate:
if (ht) {
zend_hash_internal_pointer_reset(ht);
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index 197c3f5290..81377e6bcc 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -250,6 +250,9 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
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),