diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-09 12:46:47 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-12-09 12:46:47 +0100 |
| commit | 44b234a9bc589ee6c4afe3e1c386d536f750abe2 (patch) | |
| tree | 6a31c4a403ec5a129fb19bd7fe4f2a406fe31157 | |
| parent | 20e75329f2adb11dd231852c061926d0e4080929 (diff) | |
| download | php-git-44b234a9bc589ee6c4afe3e1c386d536f750abe2.tar.gz | |
Fixed bug #78154
Handle errors during next_result in exec.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/pdo_mysql/mysql_driver.c | 3 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/bug78152.phpt | 33 |
3 files changed, 37 insertions, 1 deletions
@@ -34,6 +34,8 @@ PHP NEWS (Kamil Tekiela) . Fixed bug #63185 (nextRowset() ignores MySQL errors with native prepared statements). (Nikita) + . Fixed bug #78152 (PDO::exec() - Bad error handling with multiple commands). + (Nikita) - Phpdbg: . Fixed bug #76813 (Access violation near NULL on source operand). (cmb) diff --git a/ext/pdo_mysql/mysql_driver.c b/ext/pdo_mysql/mysql_driver.c index 344b6fe637..2d8c4698e7 100644 --- a/ext/pdo_mysql/mysql_driver.c +++ b/ext/pdo_mysql/mysql_driver.c @@ -269,7 +269,8 @@ static zend_long mysql_handle_doer(pdo_dbh_t *dbh, const char *sql, size_t sql_l MYSQL_RES* result; while (mysql_more_results(H->server)) { if (mysql_next_result(H->server)) { - PDO_DBG_RETURN(1); + pdo_mysql_error(dbh); + PDO_DBG_RETURN(-1); } result = mysql_store_result(H->server); if (result) { diff --git a/ext/pdo_mysql/tests/bug78152.phpt b/ext/pdo_mysql/tests/bug78152.phpt new file mode 100644 index 0000000000..8fc4fc7986 --- /dev/null +++ b/ext/pdo_mysql/tests/bug78152.phpt @@ -0,0 +1,33 @@ +--TEST-- +Bug #78152: PDO::exec() - Bad error handling with multiple commands +--SKIPIF-- +<?php +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'skipif.inc'); +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); +MySQLPDOTest::skip(); +?> +--FILE-- +<?php + +require_once(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'mysql_pdo_test.inc'); +$db = MySQLPDOTest::factory(); +MySQLPDOTest::createTestTable($db); + +var_dump($db->exec("INSERT INTO test(id, label) VALUES (41, 'x'); INSERT INTO test_bad(id, label) VALUES (42, 'y')")); +$db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); +try { + var_dump($db->exec("INSERT INTO test(id, label) VALUES (42, 'x'); INSERT INTO test_bad(id, label) VALUES (43, 'y')")); +} catch (PDOException $e) { + echo $e->getMessage(), "\n"; +} + +?> +--CLEAN-- +<?php +require dirname(__FILE__) . '/mysql_pdo_test.inc'; +MySQLPDOTest::dropTestTable(); +?> +--EXPECTF-- +Warning: PDO::exec(): SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.test_bad' doesn't exist in %s on line %d +bool(false) +SQLSTATE[42S02]: Base table or view not found: 1146 Table '%s.test_bad' doesn't exist |