Fix a minor problem with error reporting in JSON.

FossilOrigin-Name: c456e4a8999066cd96246327101b3cca78294511a71a2ac07939bb702bfcb5f4

diff --git a/manifest b/manifest
index b4a115361a4db47865a37367560699b20487e0c8..f3393df05d3427ea5790687094e3f852d01871c7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Create\sthe\snew\sRCStr\sclass\sof\sstrings\sand\stry\sto\suse\sthem\sfor\sJSON\sstorage.
-D 2023-07-25T15:08:18.543
+C Fix\sa\sminor\sproblem\swith\serror\sreporting\sin\sJSON.
+D 2023-07-25T15:43:01.908
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -598,7 +598,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 3add12eb29f09a99dc260bcde427ea925f600cf0bb0d9abb0618a03d7e50eead
+F src/json.c 8f44f1aadfe1967af70dc9e6390823806f5a42cc301f11df435a1c3d4950308d
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465
 F src/main.c 512b1d45bc556edf4471a845afb7ba79e64bd5b832ab222dc195c469534cd002
@@ -2044,11 +2044,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 28c6e964b1e2257527df02b352f02e135f7c4b764b8b41eda6461f9538f5d042
-R 4c5edeff0b59e42b46536f2b483d14f6
-T *branch * json-opt-rcstr
-T *sym-json-opt-rcstr *
-T -sym-json-opt *
+P c1b8725089bb3d006ec69add28f4fcb3f4e79412c7f438b5b1067c2227e77b9c
+R 625da2283c68c7b3c0e2eb949802be15
 U drh
-Z 3f6f4e5856b228a13fb14e603baeb559
+Z 238deba72513ff58266287df7bec917f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 59c5808d178d7e5afa8408d3a4c92b0077575828..70df72c92147e3ec0977f1381de47029c3877ad2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c1b8725089bb3d006ec69add28f4fcb3f4e79412c7f438b5b1067c2227e77b9c
\ No newline at end of file
+c456e4a8999066cd96246327101b3cca78294511a71a2ac07939bb702bfcb5f4
\ No newline at end of file

diff --git a/src/json.c b/src/json.c
index 3bfa0c7484e747d3e11b3633c49c83e4f53e6992..18c47214557b60049ffae21622751b67a33b88d1 100644 (file)
--- a/src/json.c
+++ b/src/json.c
@@ -530,7 +530,7 @@ static void jsonResult(JsonString *p){
                             (void(*)(void*))sqlite3RCStrUnref,
                             SQLITE_UTF8);
     }
-  }else{
+  }else if( p->bErr==1 ){
     sqlite3_result_error_nomem(p->pCtx);
   }
   jsonReset(p);