diff options
| author | Johannes Schlüter <johannes@php.net> | 2011-05-16 15:37:39 +0000 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2011-05-16 15:37:39 +0000 |
| commit | 3e17b490084ac9ffd77fd483fbb73857390166f7 (patch) | |
| tree | 62e7a227584e40c752122a0d5fe82f02043a6360 | |
| parent | 9e5bc2c1384c850c60b23da11714fbf197d7caa1 (diff) | |
| download | php-git-3e17b490084ac9ffd77fd483fbb73857390166f7.tar.gz | |
- Fix Bug #53782 (foreach throws irrelevant exception)
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | ext/pdo_mysql/mysql_statement.c | 6 | ||||
| -rw-r--r-- | ext/pdo_mysql/tests/bug53782.phpt | 40 |
3 files changed, 46 insertions, 1 deletions
@@ -85,6 +85,7 @@ PHP NEWS - PDO MySQL driver: . Fixed bug #54644 (wrong pathes in php_pdo_mysql_int.h). (Tony, Johannes) + . Fixed bug #53782 (foreach throws irrelevant exception). (Johannes, Andrey) . Implemented FR #48587 (MySQL PDO driver doesn't support SSL connections). (Rob) diff --git a/ext/pdo_mysql/mysql_statement.c b/ext/pdo_mysql/mysql_statement.c index 79694b368a..470cd0898e 100755 --- a/ext/pdo_mysql/mysql_statement.c +++ b/ext/pdo_mysql/mysql_statement.c @@ -656,7 +656,11 @@ static int pdo_mysql_stmt_fetch(pdo_stmt_t *stmt, #endif /* PDO_USE_MYSQLND */ if ((S->current_data = mysql_fetch_row(S->result)) == NULL) { - if (mysql_errno(S->H->server)) { +#if PDO_USE_MYSQLND + if (S->result->unbuf && !S->result->unbuf->eof_reached && mysql_errno(S->H->server)) { +#else + if (!S->result->eof && mysql_errno(S->H->server)) { +#endif pdo_mysql_error_stmt(stmt); } PDO_DBG_RETURN(0); diff --git a/ext/pdo_mysql/tests/bug53782.phpt b/ext/pdo_mysql/tests/bug53782.phpt new file mode 100644 index 0000000000..4f81cceef2 --- /dev/null +++ b/ext/pdo_mysql/tests/bug53782.phpt @@ -0,0 +1,40 @@ +--TEST-- +PDO MySQL Bug #53782 (foreach throws irrelevant exception) +--SKIPIF-- +<?php +if (!extension_loaded('pdo') || !extension_loaded('pdo_mysql')) 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__) . '/config.inc'; +require dirname(__FILE__) . '/../../../ext/pdo/tests/pdo_test.inc'; +$conn = PDOTest::test_factory(dirname(__FILE__) . '/common.phpt'); + +$conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + +$res = $conn->query('SELECT 0'); + +try { + $conn->query('ERROR'); +} catch (PDOException $e) { + echo "Caught: ".$e->getMessage()."\n"; +} + +foreach ($res as $k => $v) { + echo "Value: $v[0]\n"; +} + +echo "DONE"; +?> +--CLEAN-- +<?php +require dirname(__FILE__) . '/mysql_pdo_test.inc'; +MySQLPDOTest::dropTestTable(); +?> +--EXPECTF-- +Caught: SQLSTATE[42000]: %s +Value: 0 +DONE |