Ensure that sqlite3VdbeMemSetStr() always leaves the value in a consistent

state even if there is an error.

FossilOrigin-Name: c86ab289ec31ce9ae0abaf103a829b8d1e5ed632f493456f1f40607aeb91b41c

diff --git a/manifest b/manifest
index 39902b1ae85883f8377b2f5b8ca8dadd55ed2543..ea110e4ef5df3ddc897d9eeafef983f4146865c0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reverse\sthe\sorder\sof\stwo\stests\sto\sstop\sa\sharmless\sinitialized\svalue\nwarning\sfrom\sMSAN\s-\sreported\sby\sOSSFuzz.
-D 2022-03-29T19:19:23.454
+C Ensure\sthat\ssqlite3VdbeMemSetStr()\salways\sleaves\sthe\svalue\sin\sa\sconsistent\nstate\seven\sif\sthere\sis\san\serror.
+D 2022-03-29T20:50:20.630
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -630,7 +630,7 @@ F src/vdbeInt.h 8dd91427155a38ec06e9ecbde07e33f21bc02e101625191e7613f883e379a363
 F src/vdbeapi.c 299da88f2788ac50b83890bbcfcfbfd09f5863604ad66f6165010cd897d087b5
 F src/vdbeaux.c 1de06d17a1af1bf5cc776e60afcc01c49438df90863fc4db0a0516060e7b959a
 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
-F src/vdbemem.c 6538bcef73730a060e7240981b6cc6c7efeef45337da38cb491657d0112a8831
+F src/vdbemem.c 512499e51eb7cbe1d886031f19ab6f3e05655a0b25655991af01b61a631a78f7
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
 F src/vdbevtab.c f99b275366c5fc5e2d99f734729880994ab9500bdafde7fae3b02d562b9d323c
@@ -1945,8 +1945,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 d0966d1bdd474e27cb048884d340184f0e81a4fab65eb6b74682b20630caddf8
-R 362fb85ce36e696bb625349ebeaa586d
+P 800b8fdad73b67105e416b4b5c6a5c5ded7d6a43b4eacd6b67d690cab7584b0b
+R 2b3031ad1bef73c7bb072d8d8c375b8b
 U drh
-Z 1ae32a58ccc3cd421b61027296aeaf05
+Z 768c379b4a042ffc9bb001e63cb4eaa8
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index a79633940c126aeea5b23d7bb2b51dec53debc21..07c7c14b1b08ada6b8957ea49799796a8acae2b9 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-800b8fdad73b67105e416b4b5c6a5c5ded7d6a43b4eacd6b67d690cab7584b0b
\ No newline at end of file
+c86ab289ec31ce9ae0abaf103a829b8d1e5ed632f493456f1f40607aeb91b41c
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index cb44f3ab26428b8a65f9dba604c8710f11dde280..82d79a580a7b51fc3b76fbd75a5e0026296636f8 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1168,6 +1168,7 @@ int sqlite3VdbeMemSetStr(
         xDel((void*)z);
       }
     }
+    sqlite3VdbeMemSetNull(pMem);
     return sqlite3ErrorToParser(pMem->db, SQLITE_TOOBIG);
   }