Fix an incorrect assert() in STAT4 logic added just a few days ago on

[2023-02-01|/info/55a26c67ed4a3a93].

FossilOrigin-Name: 168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3

diff --git a/manifest b/manifest
index 1c38152cce31a5f600aa9a95d4ffed6a2cc7fa2e..90c4c1403f9112721537405ceb45e74b1e7b8498 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s'txn'\sdate/time\sformat.\s\sChange\sCURRENT_TIMESTAMP\sand\ssimilar\sto\suse\n'tnx'-style\ssemantics\sinstead\sof\s'now'-style.
-D 2023-02-08T12:47:37.844
+C Fix\san\sincorrect\sassert()\sin\sSTAT4\slogic\sadded\sjust\sa\sfew\sdays\sago\son\n[2023-02-01|/info/55a26c67ed4a3a93].
+D 2023-02-08T14:17:34.024
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -697,7 +697,7 @@ F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
 F src/vdbeapi.c be64df0e21a43056b62f46777749347b7d51f6e5e6c419c4bf42ce9bf98d6064
 F src/vdbeaux.c 9f2a2ec80ff90266ab603065c32dd3c8b0a53023ab7210a03fccf324ad6ddbce
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c 87d3811aabb68eb9210c14c9a8b5e8ec3acb7ba787beb80a4323af54fb6013f7
+F src/vdbemem.c 86908c0ab1624df678458feb53319bf9720992e761cbccf77a36d671ce11693d
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@ -2045,9 +2045,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 9902e66a37d59c1909593bbc296091df3fa3bfa12ec7062bd84e458030f77c8d 7b2fa20e31b8a0314b9ccb97bb556898d552505dbc5943f248df3f86c0f4e008
-R 645bf11b6f82132024c9558d18e0aef7
-T +closed 7b2fa20e31b8a0314b9ccb97bb556898d552505dbc5943f248df3f86c0f4e008
+P 61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
+R b30ddae4c32511676ec9f35ba0a9073d
 U drh
-Z 2be6e595f8a3c82105db9bee2081e8f8
+Z f13262bcc096124d3a09821c781e66c8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 12478fb90063d30bdce8ec87c4813f0b30b3b1dd..7aa8813f2499c1a7942d85e941af9f4f46c010e8 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61cc8ed8d3541eddf23a9d542179c3f0223c5b8519b54d3be79988a376e25a89
\ No newline at end of file
+168fa2fb22b8c1ad80c7001a429d3a80b48acfbfebb5414a0caa76964ea647c3
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index d415f9f72ca87b190ed8d557ec18fdbe7359d3e6..31264f797fb98365a7e70a863b800ca458bf33a9 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1519,7 +1519,9 @@ static int valueFromFunction(
   }else{
     sqlite3ValueApplyAffinity(pVal, aff, SQLITE_UTF8);
     assert( rc==SQLITE_OK );
-    assert( enc==pVal->enc || db->mallocFailed );
+    assert( enc==pVal->enc
+         || (pVal->flags & MEM_Str)==0
+         || db->mallocFailed  );
 #if 0  /* Not reachable except after a prior failure */
     rc = sqlite3VdbeChangeEncoding(pVal, enc);
     if( rc==SQLITE_OK && sqlite3VdbeMemTooBig(pVal) ){