]> granicus.if.org Git - php/commitdiff
Fixed bug #72570 Segmentation fault when binding parameters on a query without placeh...
authorMatteo Beccati <mbeccati@php.net>
Sun, 10 Jul 2016 12:36:07 +0000 (14:36 +0200)
committerAnatol Belski <ab@php.net>
Thu, 14 Jul 2016 10:05:40 +0000 (12:05 +0200)
Special commit for 7.0.9

ext/pdo_pgsql/pgsql_statement.c
ext/pdo_pgsql/tests/bug72570.phpt [new file with mode: 0644]

index ee06cfc439f2e73262493f7bdc509bd0e6824acb..c32a81a87ac24bddfa468c01730006d7c62f2fd6 100644 (file)
@@ -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 (file)
index 0000000..e52efd9
--- /dev/null
@@ -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)