MFB: Better fix for bug #44189

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 827cc6f27c13fe71c5c55723abfdf965dac3f1c1..2b9ff4f26d8c51fae7e4ecb7ddba3b24f887991a 100755 (executable)
--- 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 4ff8513a7b6ae264b4711a9a5a032e1cba4a31e9..dbda1548fce922e16fda04e18b2fb1d2d3ba3e7b 100644 (file)
--- 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),