From bdf9c4d15c4a59c79fbe84c9a5afb7d68f3b175e Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 15 Dec 2005 22:33:02 +0000 Subject: [PATCH] Fixed bug #35694 (Improved error message for invalid fetch mode). --- NEWS | 1 + ext/pdo/pdo_stmt.c | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 8d1c345135..0991fdfe16 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,7 @@ PHP NEWS - Fixed many bugs in OCI8. (Tony) - Fixed crash and leak in mysqli when using 4.1.x client libraries and connecting to 5.x server. (Andrey) +- Fixed bug #35694 (Improved error message for invalid fetch mode). (Ilia) - Fixed bug #35690 (pack() tries to allocate huge memory block when packing float values to strings). (Tony) - Fixed bug #35655 (whitespace following end of heredoc is lost). (Ilia) diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c index 60eb726c06..ae3b47b08e 100755 --- a/ext/pdo/pdo_stmt.c +++ b/ext/pdo/pdo_stmt.c @@ -1798,13 +1798,8 @@ fail_out: break; default: - if ((mode & ~PDO_FETCH_FLAGS) < PDO_FETCH__MAX && (mode & ~PDO_FETCH_FLAGS) >= 0) { - pdo_raise_impl_error(stmt->dbh, stmt, "22003", "unhandled mode; this is a PDO bug, please report it" TSRMLS_CC); - } else { - pdo_raise_impl_error(stmt->dbh, stmt, "22003", "mode is out of range" TSRMLS_CC); - } - efree(args); - return FAILURE; + pdo_raise_impl_error(stmt->dbh, stmt, "22003", "Invalid fetch mode specified" TSRMLS_CC); + goto fail_out; } stmt->default_fetch_type = mode; -- 2.50.1