From: Ilia Alshanetsky <iliaa@php.net>
Date: Tue, 26 Feb 2008 00:14:25 +0000 (+0000)
Subject: MFB: Better fix for bug #44189
X-Git-Tag: RELEASE_2_0_0a1~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5b5f3d1944422923743474b5db52da45f0c80fb3;p=php

MFB: Better fix for bug #44189
---

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 827cc6f27c..2b9ff4f26d 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -142,10 +142,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 4ff8513a7b..dbda1548fc 100644
--- a/ext/pdo_pgsql/pgsql_statement.c
+++ b/ext/pdo_pgsql/pgsql_statement.c
@@ -183,6 +183,9 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data *
 				break;
 
 			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),