Do not try to add MEM_Term to an MEM_Static string either.

FossilOrigin-Name: 8920dcef1f75f578e3f274ab2b980a83d6ea6b761d99fc48410b26886170597b

diff --git a/manifest b/manifest
index f39e41535da863195e5d9309655fddc50329859a..f738da07e74e8ced73b52f1f2132788c60fbcf9d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\stry\sto\sapply\sMEM_Term\sto\sa\sMEM_Ephem\sstrings.
-D 2023-07-29T21:22:26.271
+C Do\snot\stry\sto\sadd\sMEM_Term\sto\san\sMEM_Static\sstring\seither.
+D 2023-07-29T22:58:47.914
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -719,7 +719,7 @@ F src/vdbeInt.h cd829ff67fc18aff2476fe3209262ba8671cb43d51cb6913de4a670e37d2fbe3
 F src/vdbeapi.c f37822f215740ede2a8fcae99bc13f2cc3a72dd0e1d22b81b9298c5ca67dbc38
 F src/vdbeaux.c a586f445945eef6ad1fcd7c94f700faa1baea93c0dbd446291c7cf65966c8470
 F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
-F src/vdbemem.c 4adae4ed1ca8f82e2cfbbfb66c9b24fd9278441bc0809656acd0c42a3bb27a36
+F src/vdbemem.c b4b34674eea99eaee7130f703b3a69c9bfdd749d1c5adfd3ab8af90aa11eed6a
 F src/vdbesort.c 0d40dca073c94e158ead752ef4225f4fee22dee84145e8c00ca2309afb489015
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c 57fa8f56478e5b5cb558cb425e7878515e0a105c54f96f1d1bbf4b9433529254
@@ -2049,8 +2049,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 b837aff79cd159061b46af59eaf96a1a1920eeece27e9e27931cf3387068d96a
-R 8ca856a21838d7a2395b37400d37c0e0
+P 2a378a66783ce4d749f7e1e7d08d8404a4aa78d47aeeefd6794b6753188438f6
+R f7430bcd5e0c8931ae75dccc5f40b292
 U drh
-Z 2764d4076490d073a4c18435dcd229a6
+Z 9911052f3d11a2b100418fc49117622a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 9fe39e460738e1f14c43b9544130b9eacd63c8a4..228ebea7df315cd18a27f1d9e733d26e9ab5b5ea 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2a378a66783ce4d749f7e1e7d08d8404a4aa78d47aeeefd6794b6753188438f6
\ No newline at end of file
+8920dcef1f75f578e3f274ab2b980a83d6ea6b761d99fc48410b26886170597b
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 1052bb2f64fdda4f264eb39c55d67bf72a46004f..0f5117dad3bebecc96cbf55f7c6322c824b2a5e4 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -322,7 +322,10 @@ int sqlite3VdbeMemClearAndResize(Mem *pMem, int szNew){
 ** this routine is a no-op.
 */
 void sqlite3VdbeMemZeroTerminateIfAble(Mem *pMem){
-  if( (pMem->flags & (MEM_Str|MEM_Term|MEM_Ephem))!=MEM_Str ) return;
+  if( (pMem->flags & (MEM_Str|MEM_Term|MEM_Ephem|MEM_Static))!=MEM_Str ){
+    /* pMem must be a string, and it cannot be an ephemeral or static string */
+    return;
+  }
   if( pMem->enc!=SQLITE_UTF8 ) return;
   if( NEVER(pMem->z==0) ) return;
   if( pMem->flags & MEM_Dyn ){