Fix OOM error reporting in the json1_group_object() SQL function. Remove

an unreachable branch from the JSON1 logic.

FossilOrigin-Name: 6492e57e65118bc6366bd92c553f4494a99f97e6

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 839e133bf2786f0bde05e04144450a98fe042b25..89dd13256bf4be9dc31a4c3de7eb09ead14b9445 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1661,7 +1661,7 @@ static void jsonObjectFinal(sqlite3_context *ctx){
   if( pStr ){
     jsonAppendChar(pStr, '}');
     if( pStr->bErr ){
-      if( pStr->bErr==0 ) sqlite3_result_error_nomem(ctx);
+      if( pStr->bErr==1 ) sqlite3_result_error_nomem(ctx);
       assert( pStr->bStatic );
     }else{
       sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
@@ -1939,9 +1939,9 @@ static int jsonEachColumn(
       /* For json_each() path and root are the same so fall through
       ** into the root case */
     }
-    case JEACH_ROOT: {
+    default: {
       const char *zRoot = p->zRoot;
-       if( zRoot==0 ) zRoot = "$";
+      if( zRoot==0 ) zRoot = "$";
       sqlite3_result_text(ctx, zRoot, -1, SQLITE_STATIC);
       break;
     }

diff --git a/manifest b/manifest
index 00dddb4f621b835324d3d413f24ab461d8936c6f..085c4d258c1de92069c26e5a79be966aea4a163f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sJSON1\sextension\sso\sthat\sthe\sJSON\svalidator\scorrectly\srejects\smalformed\nbackslash\sescapes\swithin\sstring\sliterals.
-D 2016-11-23T20:24:40.736
+C Fix\sOOM\serror\sreporting\sin\sthe\sjson1_group_object()\sSQL\sfunction.\s\sRemove\nan\sunreachable\sbranch\sfrom\sthe\sJSON1\slogic.
+D 2016-11-23T20:31:09.165
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5151cc64c4c05f3455f4f692ad11410a810d937f
@@ -213,7 +213,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c 813a2ff17b3e951a4b875ef79b5f4a0543cb0a2d
+F ext/misc/json1.c f2ff73bb3f54cc643409766162174ffec3d7ea64
 F ext/misc/memvfs.c e5225bc22e79dde6b28380f3a068ddf600683a33
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c 92699c8cd7d517ff610e6037e56506f8904dae2e
@@ -1527,8 +1527,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 8a55b8e179f3fd14ae656680ed4ebd462800e2f6
-Q +7a63539169a384960e30a63e0c8e9b0f07fa431e
-R 78afbc404fd7a41d6e0915dce5b33910
+P 7c46628380e6c6aae0f1a6175ec6136d88d10f44
+Q +b54098491531cd26ed461275ef4aae3d3ec9065e
+R bc5770aa4781f3e8a4913eb47667324a
 U drh
-Z fb25e4dac2cebbd4993e808905a4691c
+Z 8f3e1629c088cb77ee9a9e1f6a3a1194

diff --git a/manifest.uuid b/manifest.uuid
index 068722a0353eb3092aa8eb769eb7498c676b0732..79a0379674ef641178e77f85df40364e3443d8a7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7c46628380e6c6aae0f1a6175ec6136d88d10f44
\ No newline at end of file
+6492e57e65118bc6366bd92c553f4494a99f97e6
\ No newline at end of file