From fa43e21711422f4d5f1e82b6eda8a96f474c5a99 Mon Sep 17 00:00:00 2001 From: drh <> Date: Tue, 5 Dec 2023 01:44:15 +0000 Subject: [PATCH] Use an assert() to fix a harmless static analyzer warning. FossilOrigin-Name: a249ca657e624028bc6b3d2c2bcedd7162d118addb7d62ce519920cecebf1860 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/json.c | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index c0fde4f425..62d3de3ec6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sOOM\sand\scorrupt\sJSONB\shandling\sin\sjson_patch(). -D 2023-12-05T00:17:17.234 +C Use\san\sassert()\sto\sfix\sa\sharmless\sstatic\sanalyzer\swarning. +D 2023-12-05T01:44:15.015 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -688,7 +688,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 4dadaf584446be580a7a0054d25c4fc3ae17065952d5d1ffdb7a05a1cc102519 +F src/json.c 3635645a2a07070a38dade2ba34daa3f3633fd134a800cb05db236d68bc1b5c3 F src/legacy.c d7874bc885906868cd51e6c2156698f2754f02d9eee1bae2d687323c3ca8e5aa F src/loadext.c 7432c944ff197046d67a1207790a1b13eec4548c85a9457eb0896bb3641dfb36 F src/main.c 1b89f3de98d1b59fec5bac1d66d6ece21f703821b8eaa0d53d9604c35309f6f9 @@ -2145,8 +2145,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 ebf667b616235bb64b83832008342ba5e7b10b2c170d7cebc431f040fef7ecfb -R 63dbe3f87f86d8011f70d9756cf66af6 +P 1910feb0b7d5cc2b810c3322f6cca281d8730182d30d162bd7bb56800979ea91 +R a9ebb3d8db9982a53cbb9404704cc04b U drh -Z f62ad889060f6abf937d9ec41a83acdd +Z 17d27d3e2a2e6e4799038f7f740bf1ce # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 5223dccf73..0dc59fba28 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -1910feb0b7d5cc2b810c3322f6cca281d8730182d30d162bd7bb56800979ea91 \ No newline at end of file +a249ca657e624028bc6b3d2c2bcedd7162d118addb7d62ce519920cecebf1860 \ No newline at end of file diff --git a/src/json.c b/src/json.c index 57082cf3f8..7bb409a8eb 100644 --- a/src/json.c +++ b/src/json.c @@ -3873,6 +3873,7 @@ static void jsonErrorFunc( }else{ /* Convert byte-offset s.iErr into a character offset */ u32 k; + assert( s.zJson!=0 ); /* Because s.oom is false */ for(k=0; k