com php-src: Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders: ext/pdo_pgsql/pgsql_statement .c
ext/pdo_pgsql/tests/bug72570.phpt
| From: | Anatol Belski | Date: | Thu, 14 Jul 2016 10:05:40 +0000 |
| Subject: | com php-src: Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders: ext/pdo_pgsql/pgsql_statement .c ext/pdo_pgsql/tests/bug72570.phpt |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93008@lists.php.net to get a copy of this message | ||
Commit: 0f182c2495f3aa84aed76485a4406b383c77c785
Author: Matteo Beccati <mbeccati@php.net> Sun, 10 Jul 2016 14:36:07 +0200
Committer: Anatol Belski <ab@php.net> Thu, 14 Jul 2016 12:05:40 +0200
Parents: 8bd8a64db64fd1bd89aa0f10b4214f576e72a8a2
Branches: PHP-7.0.9
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0f182c2495f3aa84aed76485a4406b383c77c785
Log:
Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders
Special commit for 7.0.9
Bugs:
https://bugs.php.net/72570
Changed paths:
M ext/pdo_pgsql/pgsql_statement.c
A ext/pdo_pgsql/tests/bug72570..phpt
Diff:
diff --git a/ext/pdo_pgsql/pgsql_statement.c b/ext/pdo_pgsql/pgsql_statement.c
index ee06cfc..c32a81a 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 0000000..e52efd9
--- /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 {
+ var_dump($stmt->execute([1]));
+} catch (PDOException $e) {
+ var_dump($e->getCode());
+}
+
+?>
+--EXPECT--
+bool(false)