From: drh <> Date: Wed, 26 Jul 2023 21:53:09 +0000 (+0000) Subject: Minor changes to make coverage testing easier. X-Git-Tag: version-3.43.0~110 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f7a164f34518825ae0351fd1c4453df8f30c3afe;p=thirdparty%2Fsqlite.git Minor changes to make coverage testing easier. FossilOrigin-Name: ec8b43382e5402e15d9f2dda3cf21ac8be8c1589ddbe6c9433c33eef0036f764 --- diff --git a/manifest b/manifest index 8b99a3700b..a2ffc6aed4 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sa\sswitch()\scase\sto\sdefault\sfor\scoverage. -D 2023-07-26T19:22:43.180 +C Minor\schanges\sto\smake\scoverage\stesting\seasier. +D 2023-07-26T21:53:09.569 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 e3675df7edfd0874bed04915de9a4d91300e6745a1359457e617b50049435b0d +F src/json.c 8c21f66368929975ed41e6f5aff141b5ff2706bc0f817b0a99dfea9cb6b1b7cd F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 176d6b2cb18a6ad73b133db17f6fc351c4d9a2d510deebdb76c22bde9cfd1465 F src/main.c 512b1d45bc556edf4471a845afb7ba79e64bd5b832ab222dc195c469534cd002 @@ -2044,8 +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 01d52232dd6fbd253e77419a17df3df83d49434792d288ef96e14739a89cef3b -R 54cc47c29344f6b15ce5cc5de43ab981 +P 04f497074b9210326030f36107a43d6490a2a59c8a574e2c5429cd9bde681bf7 +R b26ff6d575d69d55cdae9f68086f2a13 U drh -Z b1ee9ef830f4f85e2fbcc03f50cf7801 +Z a6ad53b5bf3028b66640cc0d3b3e396d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 6845fa3cbe..53efddff64 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -04f497074b9210326030f36107a43d6490a2a59c8a574e2c5429cd9bde681bf7 \ No newline at end of file +ec8b43382e5402e15d9f2dda3cf21ac8be8c1589ddbe6c9433c33eef0036f764 \ No newline at end of file diff --git a/src/json.c b/src/json.c index 26ce90c516..7fb860a6ef 100644 --- a/src/json.c +++ b/src/json.c @@ -2828,14 +2828,17 @@ static void jsonReplaceNode( break; } if( sqlite3_value_subtype(pValue)!=JSON_SUBTYPE ){ - int k = jsonParseAddNode(p, JSON_STRING, n, z); char *zCopy = sqlite3DbStrDup(0, z); - if( k>0 ) p->aNode[k].jnFlags |= JNODE_RAW; + int k; if( zCopy ){ jsonParseAddCleanup(p, sqlite3_free, zCopy); - }else{ + }else{ + p->oom = 1; sqlite3_result_error_nomem(pCtx); } + k = jsonParseAddNode(p, JSON_STRING, n, zCopy); + assert( k>0 || p->oom ); + if( p->oom==0 ) p->aNode[k].jnFlags |= JNODE_RAW; }else{ JsonParse *pPatch = jsonParseCached(pCtx, pValue, pCtx, 1); if( pPatch==0 ){