From: drh <> Date: Thu, 5 Oct 2023 20:17:01 +0000 (+0000) Subject: Turn an unreachable branch into an assert(). X-Git-Tag: version-3.45.0~116^2~107 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dac27071526c6e0b54827713f8b8c2cee413a9c0;p=thirdparty%2Fsqlite.git Turn an unreachable branch into an assert(). FossilOrigin-Name: 0f75199160e48fa8c44f986f1af777adf19e40fbd114a6f58e24d5e6dede779d --- diff --git a/manifest b/manifest index 2f457f4e43..dc737fc064 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\sparsing\sof\snon-standard\s"Infinity"\sand\s"NaN"\svalues\sfrom\stext\sinto\nJSONB. -D 2023-10-05T18:33:19.785 +C Turn\san\sunreachable\sbranch\sinto\san\sassert(). +D 2023-10-05T20:17:01.522 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -670,7 +670,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 91ba143709783aef3aa7d0e04cc963284a70d1b904f0da14494ede24819b356e +F src/json.c e8befacf282a191e830e68f64cf09b1d725c7b4fac0a5617456b218832ecd760 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 98cfba10989b3da6f1807ad42444017742db7f100a54f1032af7a8b1295912c0 F src/main.c 618aeb399e993cf561864f4b0cf6a331ee4f355cf663635f8d9da3193a46aa40 @@ -2124,8 +2124,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 425f0b85a6f8ad0604c4a5faa18efb90436fedb1fe2612a559147c62cff8b7e7 -R 8b87e1b5ecb5e7b583f0e4691e8e2ff5 +P df1fbbeb83a2b4a496c9de0d86c7c8c677f8fe3bc770da163dcc1d338a17b58b +R 44eaad4f19392397a894a77de5ede2c8 U drh -Z 222bd3b1cad134cfad3fe073645453f8 +Z 855bfdf3eb65ffc730a52733ff32ac54 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 37628e34a1..ed65424673 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -df1fbbeb83a2b4a496c9de0d86c7c8c677f8fe3bc770da163dcc1d338a17b58b \ No newline at end of file +0f75199160e48fa8c44f986f1af777adf19e40fbd114a6f58e24d5e6dede779d \ No newline at end of file diff --git a/src/json.c b/src/json.c index 8b14aa3aa9..30612aff91 100644 --- a/src/json.c +++ b/src/json.c @@ -2517,7 +2517,7 @@ static void jsonRemoveAllNulls(JsonNode *pNode){ static int jsonBlobExpand(JsonParse *pParse, u32 N){ u8 *aNew; u32 t; - if( N<=pParse->nBlobAlloc ) return 0; + assert( N>pParse->nBlobAlloc ); if( pParse->nBlobAlloc==0 ){ t = 100; }else{