mirror of
https://github.com/php/php-src.git
synced 2024-11-24 10:24:11 +08:00
MFH: fix #39564 (PDO::errorInfo() returns inconsistent information when sqlite3_step() fails)
This commit is contained in:
parent
a3c2958f22
commit
9503b966ec
2
NEWS
2
NEWS
@ -50,6 +50,8 @@ PHP NEWS
|
||||
- Fixed bug #39602 (Invalid session.save_handler crashes PHP). (Dmitry)
|
||||
- Fixed bug #39583 (ftp_put() does not change transfer mode to ASCII). (Tony)
|
||||
- Fixed bug #39576 (array_walk() doesn't separate userdata zval). (Tony)
|
||||
- Fixed bug #39564 (PDO::errorInfo() returns inconsistent information when
|
||||
sqlite3_step() fails). (Tony)
|
||||
- Fixed bug #39548 (ZMSG_LOG_SCRIPT_NAME not routed to OutputDebugString()
|
||||
on Windows). (Dmitry)
|
||||
- Fixed bug #39538 (fgetcsv can't handle starting newlines and trailing odd
|
||||
|
@ -66,6 +66,7 @@ static int pdo_sqlite_stmt_execute(pdo_stmt_t *stmt TSRMLS_DC)
|
||||
return 1;
|
||||
|
||||
case SQLITE_ERROR:
|
||||
sqlite3_reset(S->stmt);
|
||||
case SQLITE_MISUSE:
|
||||
case SQLITE_BUSY:
|
||||
default:
|
||||
@ -171,6 +172,8 @@ static int pdo_sqlite_stmt_fetch(pdo_stmt_t *stmt,
|
||||
sqlite3_reset(S->stmt);
|
||||
return 0;
|
||||
|
||||
case SQLITE_ERROR:
|
||||
sqlite3_reset(S->stmt);
|
||||
default:
|
||||
pdo_sqlite_error_stmt(stmt);
|
||||
return 0;
|
||||
|
Loading…
Reference in New Issue
Block a user