cvs: php-src /ext/pdo_sqlite sqlite_statement.c
| From: | Antony Dovgal | Date: | Mon, 27 Nov 2006 12:13:02 +0000 |
| Subject: | cvs: php-src /ext/pdo_sqlite sqlite_statement.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-41751@lists.php.net to get a copy of this message | ||
tony2001 Mon Nov 27 12:13:02 2006 UTC
Modified files:
/php-src/ext/pdo_sqlite sqlite_statement.c
Log:
fix #39564 (PDO::errorInfo() returns inconsistent information when sqlite3_step() fails)
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo_sqlite/sqlite_statement.c?r1=1.20&r2=1.21&diff_format=u
Index: php-src/ext/pdo_sqlite/sqlite_statement.c
diff -u php-src/ext/pdo_sqlite/sqlite_statement.c:1.20
php-src/ext/pdo_sqlite/sqlite_statement.c:1.21
--- php-src/ext/pdo_sqlite/sqlite_statement.c:1.20 Sun Jan 1 13:09:53 2006
+++ php-src/ext/pdo_sqlite/sqlite_statement.c Mon Nov 27 12:13:02 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sqlite_statement.c,v 1.20 2006/01/01 13:09:53 sniper Exp $ */
+/* $Id: sqlite_statement.c,v 1.21 2006/11/27 12:13:02 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -66,6 +66,7 @@
return 1;
case SQLITE_ERROR:
+ sqlite3_reset(S->stmt);
case SQLITE_MISUSE:
case SQLITE_BUSY:
default:
@@ -156,6 +157,8 @@
sqlite3_reset(S->stmt);
return 0;
+ case SQLITE_ERROR:
+ sqlite3_reset(S->stmt);
default:
pdo_sqlite_error_stmt(stmt);
return 0;