From: drh <> Date: Thu, 27 Apr 2023 16:24:12 +0000 (+0000) Subject: Fix the handling of escape solidus in the JSON routines. X-Git-Tag: version-3.42.0~73^2~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dbcea23976955b2aa36ca9eb92b0fe5315ef7665;p=thirdparty%2Fsqlite.git Fix the handling of escape solidus in the JSON routines. FossilOrigin-Name: 676877aca235e620ee12d10235dd6ad009d4968455ec170daeb1998b94a7e0a2 --- diff --git a/manifest b/manifest index fff4f23d06..40fa719367 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C JSON\sstring\sliterals\smay\sspan\smultiple\slines\sby\sescaping\snew\sline\scharacters. -D 2023-04-27T15:48:58.281 +C Fix\sthe\shandling\sof\sescape\ssolidus\sin\sthe\sJSON\sroutines. +D 2023-04-27T16:24:12.129 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -592,7 +592,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 d0a088f85237afcf78aa9607261a4912ce1a42db3fca907305f78da8be0c51d9 +F src/json.c cdf05600af31e37ad50924f39d7fa6227a7c9b94ea3d3690312cc1b7e15b36ef F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c be5af440f3192c58681b5d43167dbca3ccbfce394d89faa22378a14264781136 F src/main.c 09bc5191f75dc48fc4dfddda143cb864c0c3dbc3297eb9a9c8e01fea58ff847d @@ -2063,8 +2063,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 fb428db3f64f148ab9a3478fdcc8b3733e58102b3c8895a482e2551d974d5661 -R 187d7b6dd1b32f74babea313dab398fc +P 66da4bd4a30c390fa1a7960ce2edaef82e63971ecf33ffb6b906db9f278041c5 +R 9748a62c2b5ef29db66fe80859611ec7 U drh -Z 182d7f6abcc455723bd9a825ca2f2b58 +Z 8f82433213e0588347a902f584c3080a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6a4b1b10bd..9374e8e5aa 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -66da4bd4a30c390fa1a7960ce2edaef82e63971ecf33ffb6b906db9f278041c5 \ No newline at end of file +676877aca235e620ee12d10235dd6ad009d4968455ec170daeb1998b94a7e0a2 \ No newline at end of file diff --git a/src/json.c b/src/json.c index e446830db9..e508209fc9 100644 --- a/src/json.c +++ b/src/json.c @@ -802,10 +802,8 @@ static void jsonReturn( c = '\t'; }else if( c=='v' ){ c = '\v'; - }else if( c=='\'' ){ - c = '\''; - }else if( c=='"' ){ - c = '"'; + }else if( c=='\'' || c=='"' || c=='/' ){ + /* pass through unchanged */ }else if( c=='0' ){ c = 0; }else if( c=='x' ){