From: drh <>
Date: Tue, 2 May 2023 17:33:34 +0000 (+0000)
Subject: Allow for lower-case "nan" to mean NaN in JSON.
X-Git-Tag: version-3.42.0~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdb40cb18f725c17b91ba133fa51ecf15f82544c;p=thirdparty%2Fsqlite.git

Allow for lower-case "nan" to mean NaN in JSON.

FossilOrigin-Name: 6bee0a19e2efb6e39097fb22602556791d3d3962c50a1a0471c39a0c61db632e
---

diff --git a/manifest b/manifest
index 4e71077e8a..abade714d5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Interpret\snegative\sarguments\sto\ssqlite3_sleep()\sas\szero.
-D 2023-05-02T16:34:15.974
+C Allow\sfor\slower-case\s"nan"\sto\smean\sNaN\sin\sJSON.
+D 2023-05-02T17:33:34.239
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -595,7 +595,7 @@ F src/hash.h 3340ab6e1d13e725571d7cee6d3e3135f0779a7d8e76a9ce0a85971fa3953c51
 F src/hwtime.h b638809e083b601b618df877b2e89cb87c2a47a01f4def10be4c4ebb54664ac7
 F src/in-operator.md 10cd8f4bcd225a32518407c2fb2484089112fd71
 F src/insert.c a8de1db43335fc4946370a7a7e47d89975ad678ddb15078a150e993ba2fb37d4
-F src/json.c acb60ec1585a98b25b18d064384f31959405e5591246480db557e264133f5939
+F src/json.c 2cbf343884b0f0e7b4c39f8cb8a2dbf4fb49d92161aff4c76a20996d799cbe18
 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa
 F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136
 F src/main.c 035be2e9ba2a0fc1701a8ab1880af3001a968a24556433538a6c073558ee4341
@@ -2068,8 +2068,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 ab78e6946ba8125a83ff155561adf9c8df4d1c09a645fce08c8245ddb08bfa3b
-R 5118eb93bc588887d626767e578c1656
+P 2b542326aa8e7e1f6ed9d999b95ae5340278e0821277a17de3cc803b4af793ae
+R 0ed38ff7ea7fb205f7e4da32e3af900c
 U drh
-Z bf1145d4ad4b3fe66c806783f54fa71a
+Z 0df555fd9f7abbe7218483f231da4a15
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 11d39eef5c..0145f4bc06 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2b542326aa8e7e1f6ed9d999b95ae5340278e0821277a17de3cc803b4af793ae
\ No newline at end of file
+6bee0a19e2efb6e39097fb22602556791d3d3962c50a1a0471c39a0c61db632e
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 9808db6fe3..acdc5a1565 100644
--- a/src/json.c
+++ b/src/json.c
@@ -1271,14 +1271,6 @@ json_parse_restart:
     jsonParseAddNode(pParse, JSON_STRING | (jnFlags<<8), j+1-i, &z[i]);
     return j+1;
   }
-  case 'n': {
-    if( strncmp(z+i,"null",4)==0 && !sqlite3Isalnum(z[i+4]) ){
-      jsonParseAddNode(pParse, JSON_NULL, 0, 0);
-      return i+4;
-    }
-    pParse->iErr = i;
-    return -1;
-  }
   case 't': {
     if( strncmp(z+i,"true",4)==0 && !sqlite3Isalnum(z[i+4]) ){
       jsonParseAddNode(pParse, JSON_TRUE, 0, 0);
@@ -1479,6 +1471,13 @@ json_parse_restart:
     pParse->iErr = i;
     return -1;
   }
+  case 'n': {
+    if( strncmp(z+i,"null",4)==0 && !sqlite3Isalnum(z[i+4]) ){
+      jsonParseAddNode(pParse, JSON_NULL, 0, 0);
+      return i+4;
+    }
+    /* fall-through into the default case that checks for NaN */
+  }
   default: {
     u32 k;
     int nn;