From: adam <adam@noemail.net>
Date: Fri, 26 Feb 2010 20:54:10 +0000 (+0000)
Subject: More double free paranoia
X-Git-Tag: mountain-lion~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3942b4b147b8b6c2f05f9fefed0f56e9d5f28b04;p=thirdparty%2Fsqlite.git

More double free paranoia

FossilOrigin-Name: 62dfb44b3b66c4acb1a7a10c44cbee1022a88883
---

diff --git a/manifest b/manifest
index b6e591dad5..de89de7190 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-C Merge\slatest\schanges\sfrom\sthe\strunk\sinto\sthe\sapple-osx\sbranch.
-D 2010-02-17T19:34:11
+C More\sdouble\sfree\sparanoia
+D 2010-02-26T20:54:10
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in df768f5addf7b6da984aa279123d2671d716cf5c
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -219,7 +216,7 @@ F src/vacuum.c 28ee5a4963d16cf2477075d85966c0f461cd79de
 F src/vdbe.c 428411c6fbd49e9a4ce043dad87a0b079d403714
 F src/vdbe.h bea1f0cd530775bdb58a340265f3cf3ee920e9b2
 F src/vdbeInt.h e276691b6835da5c0008cc5beaaecedcd7bdba8e
-F src/vdbeapi.c 5c3edfc658ca0d8b1393bb1a72d9ee1a113a98c9
+F src/vdbeapi.c 3dfa02353e360293f286dccabb11eb0c46a8eda2
 F src/vdbeaux.c 8f30e619a8077ee516fa1494fa603550fa951726
 F src/vdbeblob.c 84f924700a7a889152aeebef77ca5f4e3875ffb4
 F src/vdbemem.c aeba77b59f3553d3cc5b72c18a8267c6fba546b9
@@ -795,14 +792,9 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 7c3bede3f21812aa78105c6685654f12f0460eea 34a3413a5318050254b246ad859c91c134516a32
-R 51eed2804d37bfe35c61d7d9c3042279
-U drh
-Z 95529f1ad519dd6b198a09b230371f86
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (Darwin)
-
-iEYEARECAAYFAkt8RLMACgkQoxKgR168RlEQFgCgim8iFEvk5gL7OCpT8R+YO6Yt
-9J8An3awqu5IqvyIa+yu+/7wwBS+nxEW
-=/nZY
------END PGP SIGNATURE-----
+P 4b72e39bd00572d9375639f4b978eff1b1d9aa20
+R 0e4fd53b0c59e5aed6d9b9b2db0deda1
+T *branch * apple-osx
+T *sym-apple-osx *
+U adam
+Z 834681205dbe2d932ad16df3e881db11
diff --git a/manifest.uuid b/manifest.uuid
index 9fd24cb75d..616414d595 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4b72e39bd00572d9375639f4b978eff1b1d9aa20
\ No newline at end of file
+62dfb44b3b66c4acb1a7a10c44cbee1022a88883
\ No newline at end of file
diff --git a/src/vdbeapi.c b/src/vdbeapi.c
index 55e3401471..208cddb394 100644
--- a/src/vdbeapi.c
+++ b/src/vdbeapi.c
@@ -56,7 +56,9 @@ int sqlite3_finalize(sqlite3_stmt *pStmt){
 #if SQLITE_THREADSAFE
     sqlite3_mutex *mutex;
 #endif
-    if( db==0 ) return SQLITE_MISUSE;
+    if (!sqlite3SafetyCheckOk(db)) {
+      return SQLITE_MISUSE;
+    }
 #if SQLITE_THREADSAFE
     mutex = v->db->mutex;
 #endif
@@ -420,7 +422,7 @@ end_of_step:
 int sqlite3_step(sqlite3_stmt *pStmt){
   int rc = SQLITE_MISUSE;
   Vdbe *v = (Vdbe*)pStmt;
-  if( v && (v->db)!=0 ){
+  if( v && (sqlite3SafetyCheckOk(db = v->db))){
     int cnt = 0;
     sqlite3 *db = v->db;
 #ifdef SQLITE_ENABLE_SQLRR