diff options
| author | Matteo Beccati <mbeccati@php.net> | 2016-07-10 14:38:17 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2016-07-10 14:38:17 +0200 |
| commit | 445cb529b2cae65cbe00c4d49ee5c78e017e1b15 (patch) | |
| tree | 76d570636242ad78c4f938c58a92391b7cddce15 /ext/pdo_pgsql/pgsql_statement.c | |
| parent | 2bdeec83963ed06339281333bbded41553f67926 (diff) | |
| parent | 4d677ae0e2465188f59ec9226ee16011692286c8 (diff) | |
| download | php-git-445cb529b2cae65cbe00c4d49ee5c78e017e1b15.tar.gz | |
Merge branch 'PHP-7.0'
* PHP-7.0:
Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
Fixed bug #70313 PDO statement fails to throw exception
Diffstat (limited to 'ext/pdo_pgsql/pgsql_statement.c')
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index 6134a733ca..53fea1623a 100644 --- a/ext/pdo_pgsql/pgsql_statement.c +++ b/ext/pdo_pgsql/pgsql_statement.c @@ -292,6 +292,9 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data * break; case PDO_PARAM_EVT_ALLOC: + if (!stmt->bound_param_map) { + return 1; + } if (!zend_hash_index_exists(stmt->bound_param_map, param->paramno)) { pdo_raise_impl_error(stmt->dbh, stmt, "HY093", "parameter was not defined"); return 0; @@ -304,7 +307,7 @@ static int pgsql_stmt_param_hook(pdo_stmt_t *stmt, struct pdo_bound_param_data * case PDO_PARAM_EVT_EXEC_PRE: if (!stmt->bound_param_map) { - return 0; + return 1; } if (!S->param_values) { S->param_values = ecalloc( |