Fix a harmless use-of-initialized-value fault in the assert() logic added

by check-in [d612fb7873cf59d]

FossilOrigin-Name: 3dac90728a6a1962da478afe751582ddf8b6d4666548a805564817b21e07a246

diff --git a/manifest b/manifest
index 8753caf4e9164d575c7cd6ed19bee9ae3384bea8..2a3810a71fd31253fb8d868d2e18e2802b073a51 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarning\sin\sthe\ssession\sextension.
-D 2019-05-16T03:47:38.299
+C Fix\sa\sharmless\suse-of-initialized-value\sfault\sin\sthe\sassert()\slogic\sadded\nby\scheck-in\s[d612fb7873cf59d]
+D 2019-05-16T11:47:16.802
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -599,7 +599,7 @@ F src/vdbeInt.h 3ba14553508d66f58753952d6dd287dce4ec735de02c6440858b4891aed51c17
 F src/vdbeapi.c f9161e5c77f512fbb80091ce8af621d19c9556bda5e734cffaac1198407400da
 F src/vdbeaux.c d444f4a3ff9c571965329a186701a57fe445e4c3f4c42f87402aca75386ba358
 F src/vdbeblob.c f5c70f973ea3a9e915d1693278a5f890dc78594300cf4d54e64f2b0917c94191
-F src/vdbemem.c 14618670d96151efdcc0e0f0dd44a7a1acf94e065701159921e42ef19077b7d1
+F src/vdbemem.c e9a0aa2feb93356333bcd94491c25bac041e63e3d87e4caac67fde742dd2deba
 F src/vdbesort.c 66592d478dbb46f19aed0b42222325eadb84deb40a90eebe25c6e7c1d8468f47
 F src/vdbetrace.c fa3bf238002f0bbbdfb66cc8afb0cea284ff9f148d6439bc1f6f2b4c3b7143f0
 F src/vtab.c 1fa256c6ddad7a81e2a4dc080d015d4b0a7135767717d311298e47f6fca64bb3
@@ -1825,7 +1825,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d612fb7873cf59dfda18cabe45f674c37aa78a4587de3378b1840c99465a0269
-R 755335cc3633e819ff0edeec491ec5c4
-U mistachkin
-Z aa932ea847c93a7effce40bd2a389e8f
+P dff823ca8b5ca4a5611407b0231f89b2e8c981f50e85e361e76d3e4973cea8ca
+R 5cac7cac2aae9a027ca8b23269506de3
+U drh
+Z b31a97f638862af265326c481a9a46ed

diff --git a/manifest.uuid b/manifest.uuid
index 772f918ea2cb1db9986bb9ed80a998196c521c9a..4496b9767f30cfaaf3be412ef64c773a96805e29 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dff823ca8b5ca4a5611407b0231f89b2e8c981f50e85e361e76d3e4973cea8ca
\ No newline at end of file
+3dac90728a6a1962da478afe751582ddf8b6d4666548a805564817b21e07a246
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 8d39351fe762606f49441953b55638e0bcdf2bb5..ee4a4a3905876c25fa737a55d968faa4e3b3ffcb 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -147,7 +147,7 @@ int sqlite3VdbeMemValidStrRep(Mem *p){
   if( p->flags & MEM_Term ){
     /* Insure that the string is properly zero-terminated.  Pay particular
     ** attention to the case where p->n is odd */
-    if( p->z==p->zMalloc && p->szMalloc>0 ){
+    if( p->szMalloc>0 && p->z==p->zMalloc ){
       assert( p->enc==SQLITE_UTF8 || p->szMalloc >= ((p->n+1)&~1)+2 );
       assert( p->enc!=SQLITE_UTF8 || p->szMalloc >= p->n+1 );
     }