Mark an unreachable branch as NEVER().

FossilOrigin-Name: 414a4d660c3b505640227066b468db1268fcb1bd3fad931644a769617c6c00cd

diff --git a/manifest b/manifest
index 083967c4a7343751b0c6c8b7b2dfb56573ddf499..6095497a505528d20042c7de5aa44081d634eb98 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarning\sintroduced\sby\sthe\sprevious\scheck-in.
-D 2023-07-21T19:17:26.591
+C Mark\san\sunreachable\sbranch\sas\sNEVER().
+D 2023-07-21T22:22:13.828
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -713,7 +713,7 @@ F src/vdbeInt.h 401813862f9d75af01bdb2ab99253ad019e9d6ddcc8058e4fa61a43e9a60d1f7
 F src/vdbeapi.c dde6c4d0f87486f056b9db4d1ea185bb1d84a6839102b86e76316ba590d07cc7
 F src/vdbeaux.c b5e3f7e158518b4eca6f166ac43900640a3fe9735c710e12bfa119af21059339
 F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
-F src/vdbemem.c 490342e7ab9ac561e8e210e1efe107bc290a97bc39046637fffceb84c02cc8e4
+F src/vdbemem.c b3013dd11696db423bb410a50126d46d700fe3133b936a32195700e9731d2960
 F src/vdbesort.c 0d40dca073c94e158ead752ef4225f4fee22dee84145e8c00ca2309afb489015
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@ -2043,8 +2043,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5413b02bb629b9cbb76f7e688e94ebcf24276c01436d3feb73ff57c036e1d2aa
-R 99401c28791119c3b9a7ff587d00483e
+P 06f829e9e57c5aa495f519ad7bb379be611e8e21ef60d36e63d055e45f7a6117
+R f650c894c3b7e9fe01bf709dbdf65d35
 U drh
-Z 82c739c7a09ae5acca56a5e43e87910d
+Z ff67cbf0340dd6d2b6c094e434a4b95a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index c901fe6612c8112b29f1a438f23862f9e97780e4..58efe19050aa9c5884d1ac3ca7c9ebd6d1b69c70 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-06f829e9e57c5aa495f519ad7bb379be611e8e21ef60d36e63d055e45f7a6117
\ No newline at end of file
+414a4d660c3b505640227066b468db1268fcb1bd3fad931644a769617c6c00cd
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index b007a89cdacf7575e284310fd20cf7b727c14a23..3f845452c4050d3c2b549c00e3f1816e4fba662e 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -324,7 +324,7 @@ int sqlite3VdbeMemClearAndResize(Mem *pMem, int szNew){
 void sqlite3VdbeMemZeroTerminateIfAble(Mem *pMem){
   if( (pMem->flags & (MEM_Str|MEM_Term))!=MEM_Str ) return;
   if( pMem->enc!=SQLITE_UTF8 ) return;
-  if( pMem->z==0 ) return;
+  if( NEVER(pMem->z==0) ) return;
   if( pMem->flags & MEM_Dyn ){
     if( pMem->xDel==sqlite3_free
      && sqlite3_msize(pMem->z) >= (u64)(pMem->n+1)