From: drh <>
Date: Thu, 5 Oct 2023 15:05:33 +0000 (+0000)
Subject: Fix a memory leak following a syntax error in jsonb().
X-Git-Tag: version-3.45.0~116^2~112
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=01acfd5805349741a81b0c8666364f3795915753;p=thirdparty%2Fsqlite.git

Fix a memory leak following a syntax error in jsonb().

FossilOrigin-Name: bf4b36eda8e200b67041ebdf60fc31d0325bd84185272f8d390c56a91d6ac1ee
---

diff --git a/manifest b/manifest
index 0303e4cd7f..51517eaffb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sthe\sPG-style\ssyntax\sfor\sthe\sPATH\soperand\son\sthe\sright-hand\sside\sof\nthe\s->>\sand\s->\soperators.
-D 2023-10-05T15:02:00.537
+C Fix\sa\smemory\sleak\sfollowing\sa\ssyntax\serror\sin\sjsonb().
+D 2023-10-05T15:05:33.202
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -670,7 +670,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h f9c2dfb84dce7acf95ce6d289e46f5f9d3d1afd328e53da8f8e9008e3b3caae6
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c 3f0a94082d978bbdd33c38fefea15346c6c6bffb70bc645a71dc0f1f87dd3276
-F src/json.c 7f765a31a4b0c7df2505a43e74f5059eaff8ed851d60dfc7b6eedfdf9f5b4089
+F src/json.c 85d3615672a130f2fd22ea6005984048953b745deb48886be72f227ba6f21f9c
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2124,8 +2124,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 be5907b648386e05530d1e321e2a3e563e07e99f08373aaf9a3452adc9228dc3
-R a953453e7f2d067ffe8d15205e74a86b
+P bae5071b0834aa3b7fd4bd871f863e1b148c6558989c8f6cdd02dc4da4770953
+R 4bb974d3e61cd02ec317b43011061d2f
 U drh
-Z 1c88c01c099cd40d1caaee0961805818
+Z be9524533dfa255e55d6b8c43429a3ea
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 12eff4a58c..a27cb035f1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bae5071b0834aa3b7fd4bd871f863e1b148c6558989c8f6cdd02dc4da4770953
\ No newline at end of file
+bf4b36eda8e200b67041ebdf60fc31d0325bd84185272f8d390c56a91d6ac1ee
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 3307db0bab..24487f430c 100644
--- a/src/json.c
+++ b/src/json.c
@@ -4203,12 +4203,13 @@ static void jsonbFunc(
     x.nJson = nJson;
     if( jsonConvertTextToBlob(pParse, ctx) ){
       sqlite3_result_error(ctx, "malformed JSON", -1);
+      sqlite3_free(pParse->aBlob);
     }else{
       sqlite3_result_blob(ctx, pParse->aBlob, pParse->nBlob, sqlite3_free);
-      pParse->aBlob = 0;
-      pParse->nBlob = 0;
-      pParse->nBlobAlloc = 0;
     }
+    pParse->aBlob = 0;
+    pParse->nBlob = 0;
+    pParse->nBlobAlloc = 0;
     jsonParseReset(pParse);
   }
 }