Remove unreachable branches from the new JSON aggregate functions.

FossilOrigin-Name: 6e30f8c6c3af9b0df39783888a1479f88271f989

diff --git a/ext/misc/json1.c b/ext/misc/json1.c
index 0bd0baff122d81c28b1e41516f47d618fef8de70..37075166607289b5b56887ab29337571d63644df 100644 (file)
--- a/ext/misc/json1.c
+++ b/ext/misc/json1.c
@@ -1549,7 +1549,7 @@ static void jsonArrayFinal(sqlite3_context *ctx){
     jsonAppendChar(pStr, ']');
     if( pStr->bErr ){
       sqlite3_result_error_nomem(ctx);
-      if( !pStr->bStatic ) sqlite3_free(pStr->zBuf);
+      assert( pStr->bStatic );
     }else{
       sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
                           pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);
@@ -1597,7 +1597,7 @@ static void jsonObjectFinal(sqlite3_context *ctx){
     jsonAppendChar(pStr, '}');
     if( pStr->bErr ){
       sqlite3_result_error_nomem(ctx);
-      if( !pStr->bStatic ) sqlite3_free(pStr->zBuf);
+      assert( pStr->bStatic );
     }else{
       sqlite3_result_text(ctx, pStr->zBuf, pStr->nUsed,
                           pStr->bStatic ? SQLITE_TRANSIENT : sqlite3_free);

diff --git a/manifest b/manifest
index 777a162846d893c0434249ab7bb447bd23c65780..5325ac3c1432d376aebb8c51a2e0cb461a0b1333 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sieee754.test\smodule\sso\sthat\sit\sworks\sboth\son\ssystems\sthat\sreport\ninfinity\sas\s"inf"\sand\sas\s"Inf".
-D 2015-12-31T22:29:36.133
+C Remove\sunreachable\sbranches\sfrom\sthe\snew\sJSON\saggregate\sfunctions.
+D 2016-01-01T00:15:59.486
 F Makefile.in 28bcd6149e050dff35d4dcfd97e890cd387a499d
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 5fff077fcc46de7714ed6eebb6159a4c00eab751
@@ -191,7 +191,7 @@ F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c d4171c815d6543a9edef8308aab2951413cd8d0f
 F ext/misc/fuzzer.c 4c84635c71c26cfa7c2e5848cf49fe2d2cfcd767
 F ext/misc/ieee754.c f190d0cc5182529acb15babd177781be1ac1718c
-F ext/misc/json1.c b7ed42db00f7429c0f0b5068209c95c41b531596
+F ext/misc/json1.c 7b1155f520d5e8ec1c005d978ac675e8a7f2688a
 F ext/misc/nextchar.c 35c8b8baacb96d92abbb34a83a997b797075b342
 F ext/misc/percentile.c bcbee3c061b884eccb80e21651daaae8e1e43c63
 F ext/misc/regexp.c af92cdaa5058fcec1451e49becc7ba44dba023dc
@@ -1406,7 +1406,7 @@ F tool/vdbe_profile.tcl 246d0da094856d72d2c12efec03250d71639d19f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 8cf01fff232d15d3c7b7b62b2d890d983e1945f2
-R 1c5d971ba298f5f3c5fb001aa5fe882d
+P d41d4d7396fba60895535f21c438f8c75e7b2097
+R 2a5f60ea0e38c7e7f43524504946739d
 U drh
-Z d166bbddc4f1202c8b662a343755f966
+Z 26d827cb451c91d1af0425a029635f07

diff --git a/manifest.uuid b/manifest.uuid
index 80841183f52f4081c881759f4709bf71df109d54..f52f04dccdcca64b0bf70896612d0a11726aac82 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d41d4d7396fba60895535f21c438f8c75e7b2097
\ No newline at end of file
+6e30f8c6c3af9b0df39783888a1479f88271f989
\ No newline at end of file