From 732fb64ad38beb5f79742b25d524916d8dfae2ac Mon Sep 17 00:00:00 2001
From: drh <>
Date: Mon, 4 Dec 2023 15:22:42 +0000
Subject: [PATCH] Two new NEVER macros.

FossilOrigin-Name: 52632c92cb06faf0e804654b3490fd6c199521107bd30c8fcbc3a2a5a488098f
---
 manifest      | 12 ++++++------
 manifest.uuid |  2 +-
 src/json.c    |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/manifest b/manifest
index 9ee6f8d2ea..17837b4093 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Repair\sissues\sand\sinefficiencies\sfound\sduring\stesting.
-D 2023-12-04T13:12:45.155
+C Two\snew\sNEVER\smacros.
+D 2023-12-04T15:22:42.529
 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 fdab711d10347af4e70bbdc4dc3aca516a4ef0e6c4388cc70335ab9201bdf7eb
+F src/json.c f9628f4dc6cc2ddf26b5edb1c275e80db886634003cead23ec8c7c8db8b4fd04
 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 526b27f90897f5e35dfff7257daf6c4ce4798d649b09b8aecfb02df0449e3c51
-R a8fc2b32fcf7c8e7f15da5575d63ccf0
+P ae973cb1515f9d76409c92a2ca2ffd6b71f32b0b490a4886770e7c1b90f12611
+R 34754ed91bc896045fb5083333f2e977
 U drh
-Z 9f46540ea8d4faeba010e6034ffe6d00
+Z 8fd37e932957842ac050d54bc05491f1
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index b7d0da89ae..7bf52474de 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ae973cb1515f9d76409c92a2ca2ffd6b71f32b0b490a4886770e7c1b90f12611
\ No newline at end of file
+52632c92cb06faf0e804654b3490fd6c199521107bd30c8fcbc3a2a5a488098f
\ No newline at end of file
diff --git a/src/json.c b/src/json.c
index 6df07b0e66..feab5f4dfe 100644
--- a/src/json.c
+++ b/src/json.c
@@ -2788,7 +2788,7 @@ rebuild_from_cache:
     if( p->nBlob==0 ){
       goto json_pfa_malformed;
     }
-    if( p->aBlob==0 ){
+    if( NEVER(p->aBlob==0) ){
       goto json_pfa_oom;
     }
     if( (p->aBlob[0] & 0x0f)>JSONB_OBJECT ){
@@ -2810,7 +2810,7 @@ rebuild_from_cache:
   p->zJson = (char*)sqlite3_value_text(pArg);
   p->nJson = sqlite3_value_bytes(pArg);
   if( p->nJson==0 ) goto json_pfa_malformed;
-  if( p->zJson==0 ) goto json_pfa_oom;
+  if( NEVER(p->zJson==0) ) goto json_pfa_oom;
   if( jsonConvertTextToBlob(p, (flgs & JSON_KEEPERROR) ? 0 : ctx) ){
     if( flgs & JSON_KEEPERROR ){
       p->nErr = 1;
-- 
2.47.2