diff options
| author | Matteo Beccati <mbeccati@php.net> | 2016-07-10 14:36:07 +0200 |
|---|---|---|
| committer | Matteo Beccati <mbeccati@php.net> | 2016-07-10 14:36:07 +0200 |
| commit | 4d677ae0e2465188f59ec9226ee16011692286c8 (patch) | |
| tree | f9c18cb806116be0b9cafb0dc2b3f721e6408986 | |
| parent | 11d74b5b7977394f4dd02a8d6af34de10722beda (diff) | |
| download | php-git-4d677ae0e2465188f59ec9226ee16011692286c8.tar.gz | |
Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/pdo_pgsql/pgsql_statement.c | 3 | ||||
| -rw-r--r-- | ext/pdo_pgsql/tests/bug72570.phpt | 28 |
3 files changed, 33 insertions, 0 deletions
@@ -13,6 +13,8 @@ PHP NEWS - PDO_pgsql: . Fixed bug #70313 (PDO statement fails to throw exception). (Matteo) + . Fixed bug #72570 (Segmentation fault when binding parameters on a query + without placeholders). (Matteo) - SPL: . Fixed bug #55701 (GlobIterator throws LogicException). (Valentin VĂLCIU) diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c index 517a59718a..a5ee2e993e 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; diff --git a/ext/pdo_pgsql/tests/bug72570.phpt b/ext/pdo_pgsql/tests/bug72570.phpt new file mode 100644 index 0000000000..1ac68a3892 --- /dev/null +++ b/ext/pdo_pgsql/tests/bug72570.phpt @@ -0,0 +1,28 @@ +--TEST-- +PDO PgSQL Bug #72570 (Segmentation fault when binding parameters on a query without placeholders) +--SKIPIF-- +<?php +if (!extension_loaded('pdo') || !extension_loaded('pdo_pgsql')) die('skip not loaded'); +require dirname(__FILE__) . '/config.inc'; +require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; +PDOTest::skip(); +?> +--FILE-- +<?php +require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; +$db = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); +$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + +$db->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); + +$stmt = $db->prepare("SELECT 1"); + +try { + $stmt->execute([1]); +} catch (PDOException $e) { + var_dump($e->getCode()); +} + +?> +--EXPECT-- +string(5) "08P01" |