From: dan <Dan Kennedy>
Date: Tue, 12 Apr 2022 11:02:06 +0000 (+0000)
Subject: Modify utility function sqlite3SetString() so that it may be used safely on Parse... 
X-Git-Tag: version-3.39.0~219
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7413d9acf1e9aefc2226baf77852b67efb58e2a;p=thirdparty%2Fsqlite.git

Modify utility function sqlite3SetString() so that it may be used safely on Parse.zErrMsg. Fuzzer test case "crash-1604e5d76c92574e21e437049dab9b672e06b767.txt".

FossilOrigin-Name: 09c5a4ec13b02efd6207e26dab7beaf184f0d8ccea0bd0dfe94fc803fe5636ce
---

diff --git a/manifest b/manifest
index 6ca6515ff8..0428ce8b73 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rename\sthe\sExpr.w.iRightJoinTable\sto\sjust\sExpr.w.iJoin,\sso\sthat\sthe\swords\n"RightJoin"\sin\sthe\sformer\sname\sdo\snot\slead\sreaders\sto\sbelieve\sthat\sthis\shas\nsomething\sto\sdo\swith\sRIGHT\sJOINs\sin\sparticular.
-D 2022-04-11T11:25:28.307
+C Modify\sutility\sfunction\ssqlite3SetString()\sso\sthat\sit\smay\sbe\sused\ssafely\son\sParse.zErrMsg.\sFuzzer\stest\scase\s"crash-1604e5d76c92574e21e437049dab9b672e06b767.txt".
+D 2022-04-12T11:02:06.896
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -517,7 +517,7 @@ F src/json.c 7749b98c62f691697c7ee536b570c744c0583cab4a89200fdd0fc2aa8cc8cbd6
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 2ecb1441f9b1c22e9e022ee0776e67d259facf34b56ba892b206f0a294ee6f8c
 F src/main.c 135858d2ede0b83d779e71b07ede9c1d6b6eaab7b77bc2a85729584152769faf
-F src/malloc.c fec841aa0a0400a6f7d20706178a5d8e8219a6bf562b6fe712c17f6c26813266
+F src/malloc.c a9127efdcef92d6934c6339ea9813075b90edc0ce2e5c723556381a3828fb720
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c c8bfc9446fd0798bddd495eb5d9dbafa7d4b7287d8c22d50a83ac9daa26d8a75
@@ -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 21e96600d90c1cda84777abe22a11058eba46c9faefeb05f8c31bc0e7fa84b19
-R a4105d42712d7aa2e6c32a68a1a189b9
-U drh
-Z 0c17b37ca377860b400b2aceb3280c9a
+P e8c00442d2daedec079748d13147bf73b0ec3c3cf432bce2cdccb706bdff2853
+R ce69914b0449933d45ec56e1376c0a3b
+U dan
+Z 3e44eca52a4693d55a51d186d7ab15b4
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1302d31a5e..131b4fe466 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e8c00442d2daedec079748d13147bf73b0ec3c3cf432bce2cdccb706bdff2853
\ No newline at end of file
+09c5a4ec13b02efd6207e26dab7beaf184f0d8ccea0bd0dfe94fc803fe5636ce
\ No newline at end of file
diff --git a/src/malloc.c b/src/malloc.c
index 21e5245891..cfda60a0b6 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -750,8 +750,9 @@ char *sqlite3DbSpanDup(sqlite3 *db, const char *zStart, const char *zEnd){
 ** Free any prior content in *pz and replace it with a copy of zNew.
 */
 void sqlite3SetString(char **pz, sqlite3 *db, const char *zNew){
+  char *z = sqlite3DbStrDup(db, zNew);
   sqlite3DbFree(db, *pz);
-  *pz = sqlite3DbStrDup(db, zNew);
+  *pz = z;
 }
 
 /*