From 0bfbaa8aa55738ba80e8551d1eef357807964d9b Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Tue, 7 Oct 2008 14:06:11 +0000 Subject: [PATCH] Have sqlite3_bind_value() call sqlite3ApiExit() before returning. Otherwise the db->mallocFailed flag may not be cleared. (CVS 5777) FossilOrigin-Name: 6b7c8d56403f6b9b88b8494c86f3d62e487cb2ac --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/vdbeapi.c | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index 51a95c678a..f68d533de0 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Do\snot\suse\sdouble\sunnecessarily\sin\sdate+time\sfunctions.\s\sTicket\s#3422.\s(CVS\s5776) -D 2008-10-07T12:32:13 +C Have\ssqlite3_bind_value()\scall\ssqlite3ApiExit()\sbefore\sreturning.\sOtherwise\sthe\sdb->mallocFailed\sflag\smay\snot\sbe\scleared.\s(CVS\s5777) +D 2008-10-07T14:06:11 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in e4ab842f9a64ef61d57093539a8aab76b12810db F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -192,7 +192,7 @@ F src/vacuum.c fd77433d0c26d3ff1eb96eab017a1787ac5aa642 F src/vdbe.c c9499f1824049cfef00a6146ef832b742f477920 F src/vdbe.h 41c99aaad9167c1b5431993db446de74b2f71fc3 F src/vdbeInt.h b48c74d86a9fb62b707a3186ccca76bb32f1c6be -F src/vdbeapi.c 5beff875bef3a801484ac78c24b13a039a4d511c +F src/vdbeapi.c 319d3be8a309ecbadcdb21c3b73b158d8505ca1d F src/vdbeaux.c 20a7d109c95e32beee7891fba828c63e419af26c F src/vdbeblob.c b0dcebfafedcf9c0addc7901ad98f6f986c08935 F src/vdbefifo.c 20fda2a7c4c0bcee1b90eb7e545fefcdbf2e1de7 @@ -640,7 +640,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 22d1feb9b20b8fd9c86066b94e4220cf8929b043 -R 0fb2eeff41ff645ca471d2d7f864fae4 -U drh -Z 9376a2913d9e9e6a50b7bfc1a1ab95da +P b03231323a7f06c736c38ae3c5535d2fd025583f +R 2d8a716a431d9dece4c77326c23de85f +U danielk1977 +Z 03ceb216b128380ac04b50e2ec1cb07f diff --git a/manifest.uuid b/manifest.uuid index ad042e0d7d..7c85e09e82 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b03231323a7f06c736c38ae3c5535d2fd025583f \ No newline at end of file +6b7c8d56403f6b9b88b8494c86f3d62e487cb2ac \ No newline at end of file diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 5fd14802dd..46ccf51a93 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -13,7 +13,7 @@ ** This file contains code use to implement APIs that are part of the ** VDBE. ** -** $Id: vdbeapi.c,v 1.142 2008/10/06 12:46:44 drh Exp $ +** $Id: vdbeapi.c,v 1.143 2008/10/07 14:06:11 danielk1977 Exp $ */ #include "sqliteInt.h" #include "vdbeInt.h" @@ -1140,7 +1140,7 @@ int sqlite3_bind_value(sqlite3_stmt *pStmt, int i, const sqlite3_value *pValue){ } sqlite3_mutex_leave(p->db->mutex); } - /* rc = sqlite3ApiExit(p->db, rc); */ + rc = sqlite3ApiExit(p->db, rc); return rc; } int sqlite3_bind_zeroblob(sqlite3_stmt *pStmt, int i, int n){ -- 2.47.2