Do not assert() a bad string representation in an sqlite3_value after

an OOM.  dbsqlfuzz c822a17a23c524a0ac7cfb203c7198209da15de8.

FossilOrigin-Name: 91fee79a01971259b21478e60a069a711a00efc79ddfececa6224a152cd8d09a

diff --git a/manifest b/manifest
index 27e6d37f506a608dea8e3cd849b2cdfa74b17c77..9f1cd11163aa1ab83623f14c834fe54ead834a45 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\sCLI\s.load\sslightly\sharder\sto\sabuse.
-D 2023-04-28T00:28:06.476
+C Do\snot\sassert()\sa\sbad\sstring\srepresentation\sin\san\ssqlite3_value\safter\nan\sOOM.\s\sdbsqlfuzz\sc822a17a23c524a0ac7cfb203c7198209da15de8.
+D 2023-04-28T10:10:52.120
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -709,7 +709,7 @@ F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
 F src/vdbeapi.c b4982cde547054c4f7341198db3c3008a48e1eb028f757601bf5bf2fc026cbcf
 F src/vdbeaux.c 6ee48db408d4c297a363f1e31145c09793a580e7c508bb36063dd017d67117a2
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c 1d9a0f37b0097fbb53f0d7ba081f7181b83cee2c6f46364706ea0c3896bd8ec0
+F src/vdbemem.c 1cac4028c0dabbf1f3259f107440e2780e05ac9fe419e9709e6eb4e166ba714b
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c aae4bd769410eb7e1d02c42613eec961d514459b1c3c1c63cfc84e92a137daac
@@ -2060,8 +2060,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 2881978d7b7014738a21c590b0430c4fa40e6b00b9547d0284b7656124523ae9
-R f31a79597744826157054a8d8987cbe4
-U larrybr
-Z 94682afadd89800c43fc7c92687bd9b6
+P 2779f9270cc431786d0e16ef05ec05b0f22dda2307f3bf17467ad0b25304e160
+R fcf6991862458e9816409ec8d717ddc8
+U drh
+Z d3df2b888a0fbd6bd36c6662515c45b3
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index df2a5b57856f2b252981f7e85b867d5d1155ffed..e2c06ba976b0770ab02f23599c399030e326b0b4 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2779f9270cc431786d0e16ef05ec05b0f22dda2307f3bf17467ad0b25304e160
\ No newline at end of file
+91fee79a01971259b21478e60a069a711a00efc79ddfececa6224a152cd8d09a
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 7b3b970f3f1d0b55607fdd48d33c31cb5e34db8d..d3cd55ba9f3daea1469e98e0f11f1fac6970e693 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -157,6 +157,7 @@ int sqlite3VdbeMemValidStrRep(Mem *p){
   char *z;
   int i, j, incr;
   if( (p->flags & MEM_Str)==0 ) return 1;
+  if( p->db && p->db->mallocFailed ) return 1;
   if( p->flags & MEM_Term ){
     /* Insure that the string is properly zero-terminated.  Pay particular
     ** attention to the case where p->n is odd */