Rearrange an expression in vdbemem.c to avoid a (harmless) reference to a possibly...

FossilOrigin-Name: 4a7b3fa049a9aa0668e318287edd4a78c0588bf8

diff --git a/manifest b/manifest
index 94c543c920284bff5373e7cf27ba2d18966d88b5..c9b3f13ddeea85fb9144f721c8ffdbf8ec834857 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\ssure\snew\ssqlite3_vtab\sobjects\screated\sby\sthe\sxCreate()\svirtual\stable\nmethod\sare\sinitialized\sby\sthe\ssystem,\sin\saccordance\swith\sthe\sdocumentation.
-D 2014-10-14T20:25:43.215
+C Rearrange\san\sexpression\sin\svdbemem.c\sto\savoid\sa\s(harmless)\sreference\sto\sa\spossibly\sunitialized\svariable.
+D 2014-10-15T11:31:35.560
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -295,7 +295,7 @@ F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
 F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
 F src/vdbeaux.c edbb7a9c8b2a8f7a68ac75c2475edd4040266b76
 F src/vdbeblob.c 848238dc73e93e48432991bb5651bf87d865eca4
-F src/vdbemem.c 481327f50d9da330053aa7456702ce46d0a4e70f
+F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
 F src/vdbesort.c 5c1bacf90578d22b630fbf6ed98ccf60d83435ef
 F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
 F src/vtab.c cb0c194303fea276b48d7d4b6d970b5a96bde8de
@@ -1204,7 +1204,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 005e5b388a8a97bca6d1f0e06c40d68d92aa1212
-R 69c5ef77aff899ac36ba1309415e232b
-U drh
-Z ba859354cbc6c4d678eb09a46ba9f63b
+P eab82330631187dcc3e5d2dddd23dbda5752904b
+R c46357701a0c6687b1cdb44cc5cea3cc
+U dan
+Z f35b20ba175f90e21204e2589425beed

diff --git a/manifest.uuid b/manifest.uuid
index 83a00ae67fd27cbbf56b6ec78b42d224fc17cbc6..2ed282008d3fd6a1596d82531feea3659ac24956 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-eab82330631187dcc3e5d2dddd23dbda5752904b
\ No newline at end of file
+4a7b3fa049a9aa0668e318287edd4a78c0588bf8
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 0c62db07206748dcb1a27f756234870f2d466c76..870fb5bd891c2c83ae8c8683afa5ceca93b99649 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -143,7 +143,7 @@ SQLITE_NOINLINE int sqlite3VdbeMemGrow(Mem *pMem, int n, int bPreserve){
     }
   }
 
-  if( pMem->z && bPreserve && pMem->z!=pMem->zMalloc ){
+  if( bPreserve && pMem->z && pMem->z!=pMem->zMalloc ){
     memcpy(pMem->zMalloc, pMem->z, pMem->n);
   }
   if( (pMem->flags&MEM_Dyn)!=0 ){