From: drh <drh@noemail.net>
Date: Sat, 6 Feb 2016 19:48:50 +0000 (+0000)
Subject: Make sure variable declarations occur at the beginning of blocks, even
X-Git-Tag: version-3.11.0~43
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f5818aa560fc463e241bbeeaefba8cfacdd0131f;p=thirdparty%2Fsqlite.git

Make sure variable declarations occur at the beginning of blocks, even
with SQLITE_DEBUG enabled.

FossilOrigin-Name: 2f7778e64d93ef237e23ceac01ea9808df5cf2a1
---

diff --git a/manifest b/manifest
index d6e074a0b5..098cff6d3a 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\san\sassert()\sto\shave\sa\stest\sinstead\sof\sa\sside\seffect
-D 2016-02-06T14:14:43.463
+C Make\ssure\svariable\sdeclarations\soccur\sat\sthe\sbeginning\sof\sblocks,\seven\nwith\sSQLITE_DEBUG\senabled.
+D 2016-02-06T19:48:50.321
 F Makefile.in 027c1603f255390c43a426671055a31c0a65fdb4
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 72b7858f02017611c3ac1ddc965251017fed0845
@@ -314,7 +314,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c b1b0880fc474abfab89e737b0ecfde0bd7a60902
 F src/loadext.c 84996d7d70a605597d79c1f1d7b2012a5fd34f2b
 F src/main.c 62b7fe3ed245757d1ff2e6268a7ec0bc30100308
-F src/malloc.c 55ebb1701ebd39985dbcc497aaecb09192b69682
+F src/malloc.c 337e9808b5231855fe28857950f4f60ae42c417f
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c 6919bcf12f221868ea066eec27e579fed95ce98b
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -1426,7 +1426,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 22589018ac3321f7bd89ce9fa69e57eae395e324
-R e3d82b169cbfebcfd4c4fb1447b3dcc4
-U pdr
-Z 6e44ca05901e086eb71b8481afaf44d8
+P a2952231ac7abe165ed070875728f752ae0be608
+R da8a8c4dec6af3be8a6f4cff524d4f5f
+U drh
+Z f3b1e3c58e3e9ab1cb32cfa377da1181
diff --git a/manifest.uuid b/manifest.uuid
index 4f51f901e5..c92bb840b3 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a2952231ac7abe165ed070875728f752ae0be608
\ No newline at end of file
+2f7778e64d93ef237e23ceac01ea9808df5cf2a1
\ No newline at end of file
diff --git a/src/malloc.c b/src/malloc.c
index 1ff0a5221d..ebe0440350 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -626,11 +626,11 @@ void *sqlite3DbMallocRaw(sqlite3 *db, u64 n){
   return p;
 }
 void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){
+#ifndef SQLITE_OMIT_LOOKASIDE
+  LookasideSlot *pBuf;
   assert( db!=0 );
   assert( sqlite3_mutex_held(db->mutex) );
   assert( db->pnBytesFreed==0 );
-#ifndef SQLITE_OMIT_LOOKASIDE
-  LookasideSlot *pBuf;
   if( db->lookaside.bDisable==0 ){
     assert( db->mallocFailed==0 );
     if( n>db->lookaside.sz ){
@@ -650,6 +650,9 @@ void *sqlite3DbMallocRawNN(sqlite3 *db, u64 n){
     return 0;
   }
 #else
+  assert( db!=0 );
+  assert( sqlite3_mutex_held(db->mutex) );
+  assert( db->pnBytesFreed==0 );
   if( db->mallocFailed ){
     return 0;
   }