Fix a NEVER() that can sometimes be true.

dbsqlfuzz 9a86fb3830977e216fde061bfbe1c1e5c2e9bfc4

FossilOrigin-Name: f39666e64d6d32420170c54f874d8314eb8c6f91df625f7b28f9ccffb9474dc0

diff --git a/manifest b/manifest
index 00ad923b3efebb2d452c8b25bf6837501230bb88..465e5bc74eea2707288d5edec521a6b9c62bb3e4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enable\sthe\ssqlite3_serialize()\sand\ssqlite3_deserialize()\sinterfaces\sby\ndefault.\s\sOmit\sthe\sSQLITE_ENABLE_DESERIALIZE\soption\sand\sreplace\sit\swith\nthe\sSQLITE_OMIT_DESERIALIZE\soption.
-D 2021-05-08T17:18:23.807
+C Fix\sa\sNEVER()\sthat\scan\ssometimes\sbe\strue.\ndbsqlfuzz\s9a86fb3830977e216fde061bfbe1c1e5c2e9bfc4
+D 2021-05-11T10:47:41.595
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -484,7 +484,7 @@ F src/auth.c 08954fdc4cc2da5264ba5b75cfd90b67a6fc7d1710a02ccf917c38eadec77853
 F src/backup.c 3014889fa06e20e6adfa0d07b60097eec1f6e5b06671625f476a714d2356513d
 F src/bitvec.c 17ea48eff8ba979f1f5b04cc484c7bb2be632f33
 F src/btmutex.c 8acc2f464ee76324bf13310df5692a262b801808984c1b79defb2503bbafadb6
-F src/btree.c 3b1f4a53cdcad0a176d1d2c9b0aa6330993948ff566006d33ed2647d6f319fd1
+F src/btree.c 5372d8bca3374145477e129be5ed6e907731e1d117c0dc1b524b536f1cc0e577
 F src/btree.h 096cc53baa58be22b02c896d1cf933c38cfc6d65f9253c1367ece8cc88a24de5
 F src/btreeInt.h 7bc15a24a02662409ebcd6aeaa1065522d14b7fda71573a2b0568b458f514ae0
 F src/build.c bf4f76eb77ff0193ef826f9dbd0285e8b55fe8ecb24d1f6b14bf72b68df6a422
@@ -1912,7 +1912,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 560753148a16a0032477e379af6f62d9357f69847f351cc9db6021ce1b5594ea
-R 2599a26d56e1db68b4bf98f53c8053f1
+P 6df3b03e00b1143be8fed3a39a58ce81063020275aa1ac13d87c84f1ceda6e27
+R 888429298506a7a430e45d7ff6f16cee
 U drh
-Z aabbbb00e74a256a0714c7d678ee3f12
+Z 3810e14a95fb243baca7c6b1006c9619

diff --git a/manifest.uuid b/manifest.uuid
index 73e93e201310b466b885a1656e645b1e5a4c94b4..d8161e31ce95a6417258555da5859ca8f9a19bb2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6df3b03e00b1143be8fed3a39a58ce81063020275aa1ac13d87c84f1ceda6e27
\ No newline at end of file
+f39666e64d6d32420170c54f874d8314eb8c6f91df625f7b28f9ccffb9474dc0
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 3f7690daedb8543db233125dc9a492889e41c3f9..7ee0b4eaf6383704d67665fa62e7a1d400c2071b 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -7168,8 +7168,8 @@ static int pageFreeArray(
         }
         pFree = pCell;
         szFree = sz;
-        if( NEVER(pFree+sz>pEnd) ){
-          return 0;  /* Corruption - should be previously detected */
+        if( pFree+sz>pEnd ){
+          return 0;
         }
       }else{
         pFree = pCell;