iliaa Wed Dec 21 16:23:12 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/sqlite pdo_sqlite2.c
Log:
Don't lose track of exec() errors in pdo_sqlite2
http://cvs.php.net/viewcvs.cgi/php-src/ext/sqlite/pdo_sqlite2.c?r1=1.6.2.1&r2=1.6.2.2&diff_format=u
Index: php-src/ext/sqlite/pdo_sqlite2.c
diff -u php-src/ext/sqlite/pdo_sqlite2.c:1.6.2.1
php-src/ext/sqlite/pdo_sqlite2.c:1.6.2.2
--- php-src/ext/sqlite/pdo_sqlite2.c:1.6.2.1 Tue Dec 6 02:25:32 2005
+++ php-src/ext/sqlite/pdo_sqlite2.c Wed Dec 21 16:23:12 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_sqlite2.c,v 1.6.2.1 2005/12/06 02:25:32 sniper Exp $ */
+/* $Id: pdo_sqlite2.c,v 1.6.2.2 2005/12/21 16:23:12 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -326,6 +326,10 @@
sqlite_close(H->db);
H->db = NULL;
}
+ if (H->einfo.errmsg) {
+ pefree(H->einfo.errmsg, dbh->is_persistent);
+ H->einfo.errmsg = NULL;
+ }
pefree(H, dbh->is_persistent);
dbh->driver_data = NULL;
}
@@ -357,7 +361,7 @@
pdo_sqlite2_db_handle *H = (pdo_sqlite2_db_handle *)dbh->driver_data;
char *errmsg = NULL;
- if (sqlite_exec(H->db, sql, NULL, NULL, &errmsg) != SQLITE_OK) {
+ if ((H->einfo.errcode = sqlite_exec(H->db, sql, NULL, NULL, &errmsg))
!= SQLITE_OK) {
pdo_sqlite2_error(errmsg, dbh);
return -1;
} else {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
