From: drh <>
Date: Thu, 28 Sep 2023 17:07:43 +0000 (+0000)
Subject: Miscellaneous bugs fixed.
X-Git-Tag: version-3.45.0~116^2~139^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=59862e6d224f7bdbd368cc2827ea06a3a2c82d29;p=thirdparty%2Fsqlite.git

Miscellaneous bugs fixed.

FossilOrigin-Name: 5c0815fa2e422d81198a43a2c04a022e319fcbcadfd4be4437f2e663892ca26b
---

diff --git a/manifest b/manifest
index d05d5a4eac..c1019d925c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sjson_extract()\sto\sbetter\ssupport\sJSONB.\sStill\snot\s100%\sworking.
-D 2023-09-28T15:56:35.608
+C Miscellaneous\sbugs\sfixed.
+D 2023-09-28T17:07:43.443
 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 c9d70a47aabc97b51cd21a33be7602db4760a980920b44b497dbb331a91c12d8
+F src/json.c 946e0bbc5070db333a370e2f7b806ad07d2e9fb93d057cf52a9e5fb58fd43768
 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 c1feba70f55a8e5f4696d48e4706855415d173ac8ac3c2656787c242a883b4f5
-R df67f115b3402f37b4410f24659e50ec
+P 8c82576176539c4d132b14d46adbf31366c4bcaa59a61dd639dc9cc308fe8825
+R e6233e4f5d16d81e42c25a8ff039c998
 U drh
-Z a8b3beeec30b8fa8de8cb3c4ca40d323
+Z beeeb6a9ecf43431f000f927a20c9a15
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index a7573f00b7..5bf7e31c95 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8c82576176539c4d132b14d46adbf31366c4bcaa59a61dd639dc9cc308fe8825
\ No newline at end of file
+5c0815fa2e422d81198a43a2c04a022e319fcbcadfd4be4437f2e663892ca26b
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 33c9404105..322fbc5602 100644
--- a/src/json.c
+++ b/src/json.c
@@ -518,6 +518,14 @@ static void jsonAppendNormalizedString(JsonString *p, const char *zIn, u32 N){
 ** features.
 */
 static void jsonAppendNormalizedInt(JsonString *p, const char *zIn, u32 N){
+  char *zBuf = sqlite3_malloc64( N+1 );
+  if( zBuf==0 ){
+    p->bErr = 1;
+    return;
+  }
+  memcpy(zBuf, zIn, N);
+  zBuf[N] = 0;
+  zIn = zBuf;
   if( zIn[0]=='+' ){
     zIn++;
     N--;
@@ -539,6 +547,7 @@ static void jsonAppendNormalizedInt(JsonString *p, const char *zIn, u32 N){
   }
   assert( N>0 );
   jsonAppendRawNZ(p, zIn, N);
+  sqlite3_free(zBuf);
 }
 
 /*
@@ -958,12 +967,16 @@ static void jsonReturn(
       int rc;
       int bNeg = 0;
       const char *z;
+      char *zz;
+      sqlite3 *db = sqlite3_context_db_handle(pCtx);
 
       assert( pNode->eU==1 );
-      z = pNode->u.zJContent;
+      zz = sqlite3DbStrNDup(db, pNode->u.zJContent, pNode->n);
+      z = zz;
       if( z[0]=='-' ){ z++; bNeg = 1; }
       else if( z[0]=='+' ){ z++; }
       rc = sqlite3DecOrHexToI64(z, &i);
+      sqlite3DbFree(db, zz);
       if( rc<=1 ){
         sqlite3_result_int64(pCtx, bNeg ? -i : i);
       }else if( rc==3 && bNeg ){
@@ -1862,7 +1875,7 @@ static int jsonParse(
     i = jsonParseValue(pParse, 0);
   }
   if( pParse->oom ) i = -1;
-  if( i>0 ){
+  if( !pParse->isBinary && i>0 ){
     assert( pParse->iDepth==0 );
     while( fast_isspace(zJson[i]) ) i++;
     if( zJson[i] ){
@@ -3359,6 +3372,7 @@ static int jsonParseValueFromBlob(JsonParse *pParse, u32 i){
       break;
     }
   }
+  pParse->aBlob[i] = 0;
   return i+x+sz;
 }
 
@@ -3450,7 +3464,7 @@ static void jsonRenderNodeAsBlob(
     case JSON_ARRAY: {
       u32 j = 1;
       u32 iStart, iThis = pOut->nBlob;
-      jsonBlobAppendNodeType(pOut, JSONB_ARRAY, 0x7fffffff);
+      jsonBlobAppendNodeType(pOut, JSONB_ARRAY, pParse->nJson*2);
       iStart = pOut->nBlob;
       for(;;){
         while( j<=pNode->n ){
@@ -3471,7 +3485,7 @@ static void jsonRenderNodeAsBlob(
     case JSON_OBJECT: {
       u32 j = 1;
       u32 iStart, iThis = pOut->nBlob;
-      jsonBlobAppendNodeType(pOut, JSONB_OBJECT, 0x7fffffff);
+      jsonBlobAppendNodeType(pOut, JSONB_OBJECT, pParse->nJson*2);
       iStart = pOut->nBlob;
       for(;;){
         while( j<=pNode->n ){