From: drh <>
Date: Thu, 28 Sep 2023 19:11:36 +0000 (+0000)
Subject: Fix some minor memory issues so that all legacy tests now pass.
X-Git-Tag: version-3.45.0~116^2~136
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cdab142863a98b84baf047ce443ee37ed141ab1;p=thirdparty%2Fsqlite.git

Fix some minor memory issues so that all legacy tests now pass.

FossilOrigin-Name: 1744bfc669346ff221f28d45fd978863e876a2d2f0b82bcf0e5ee6f0326900cc
---

diff --git a/manifest b/manifest
index 6ac2aacfe0..5be61e1831 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Allow\sthe\ssqlite3_user_data()\sfunction\sto\sbe\sinvoked\swith\sa\sNULL\sargument\nor\swith\san\ssqlite3_context\spointer\sfrom\sa\svirtual\stable.\s\sIt\sreturns\sNULL\nin\sboth\scases.
-D 2023-09-28T18:23:52.254
+C Fix\ssome\sminor\smemory\sissues\sso\sthat\sall\slegacy\stests\snow\spass.
+D 2023-09-28T19:11:36.692
 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 7e68346bfc4f030e454c68751ab7082af52b9925ff28bff88eef03258e486d7c
+F src/json.c 6ecde7714aed5238881b936edc3f9bf85c2ece02f2b1a41e10f5d5f3e8f89513
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0
 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40
@@ -2123,8 +2123,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 cee113cc315b04fd75ccc172cf4529bf15b2050bf274433496c31a282e281ab8
-R 447caeefd53e356f21199c52281cba5f
+P 2f49687371ada65fef374336c28b352c48ab98dc31282ac82397035efe04ba11
+R 3d149364fb767414041d170ea764743b
 U drh
-Z 98132ac7eca8ce40c36975540dff67b4
+Z 6ffc9f7e51690a482c053773cfbc0f4b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index f38a3e887b..fe5f150f03 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2f49687371ada65fef374336c28b352c48ab98dc31282ac82397035efe04ba11
\ No newline at end of file
+1744bfc669346ff221f28d45fd978863e876a2d2f0b82bcf0e5ee6f0326900cc
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index e43240c71c..3d44489e6f 100644
--- a/src/json.c
+++ b/src/json.c
@@ -543,10 +543,10 @@ static void jsonAppendNormalizedInt(JsonString *p, const char *zIn, u32 N){
       assert( rc==2 );
       jsonAppendRawNZ(p, "9.0e999", 7);
     }
-    return;
+  }else{
+    assert( N>0 );
+    jsonAppendRawNZ(p, zIn, N);
   }
-  assert( N>0 );
-  jsonAppendRawNZ(p, zIn, N);
   sqlite3_free(zBuf);
 }
 
@@ -972,6 +972,10 @@ static void jsonReturn(
 
       assert( pNode->eU==1 );
       zz = sqlite3DbStrNDup(db, pNode->u.zJContent, pNode->n);
+      if( zz==0 ){
+        sqlite3_result_error_nomem(pCtx);
+        return;
+      }
       z = zz;
       if( z[0]=='-' ){ z++; bNeg = 1; }
       else if( z[0]=='+' ){ z++; }