From: drh <>
Date: Sun, 28 Nov 2021 19:54:38 +0000 (+0000)
Subject: Following a prior error, an ALWAYS() in sqlite3ExprCanBeNull() might be false.
X-Git-Tag: version-3.38.0~216
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6df8c0cd3b971ab51431ac0ec124be77f5b1ccec;p=thirdparty%2Fsqlite.git

Following a prior error, an ALWAYS() in sqlite3ExprCanBeNull() might be false.
dbsqlfuzz 5dbec6678a20e7595a34dfdd869a3b9722b3ca43.

FossilOrigin-Name: 4e207401acce1bdc17025f2d55bd94234b435e286cd43e1eda03b6949a2a91d3
---

diff --git a/manifest b/manifest
index dfb723ab2a..262f1306c1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.37.0
-D 2021-11-27T14:13:22.430
+C Following\sa\sprior\serror,\san\sALWAYS()\sin\ssqlite3ExprCanBeNull()\smight\sbe\sfalse.\ndbsqlfuzz\s5dbec6678a20e7595a34dfdd869a3b9722b3ca43.
+D 2021-11-28T19:54:38.307
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -502,7 +502,7 @@ F src/date.c fa928630fecf1d436cdc7a7a5c950c781709023ca782c21b7a43cc7361a9451e
 F src/dbpage.c 8a01e865bf8bc6d7b1844b4314443a6436c07c3efe1d488ed89e81719047833a
 F src/dbstat.c 861e08690fcb0f2ee1165eff0060ea8d4f3e2ea10f80dab7d32ad70443a6ff2d
 F src/delete.c 0c151975fa99560767d7747f9b60543d0093d9f8b89f13d2d6058e9c83ad19e7
-F src/expr.c 4b6dfb224b6234ff4f529023993b503048e1b045ff49cbb911e7d28a28cca795
+F src/expr.c 827179c78d2ca7cc318392811de8151c60eacf7ce804b13e61bb7ef38f954846
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 187b67af20c5795953a592832c5d985e4313fe503ebd8f95e3e9e9ad5a730bb5
 F src/func.c 1cfb09d7ffca81238eccefdb0293e1f5b7cfebbd1816dfad5ec6024742a7496b
@@ -1933,10 +1933,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 7c567338ae4dd31097e9ae5c693b84369c35c5a52534797e8186b4be7297ba78
-R 1bdaa083fa0abfc53c61429627c688f2
-T +sym-major-release *
-T +sym-release *
-T +sym-version-3.37.0 *
+P bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
+R ee6ac26534b5f5e3f1e9b2504f0fbd97
 U drh
-Z 6f6dbee10adfe1c5275055f73bc6984f
+Z 9896c4e7bad9bcf4c4f3ad7c3deddb22
diff --git a/manifest.uuid b/manifest.uuid
index 44318ef9d2..5374c9a521 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bd41822c7424d393a30e92ff6cb254d25c26769889c1499a18a0b9339f5d6c8a
\ No newline at end of file
+4e207401acce1bdc17025f2d55bd94234b435e286cd43e1eda03b6949a2a91d3
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 2a00748846..a51d37a7b7 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2457,7 +2457,7 @@ int sqlite3ExprCanBeNull(const Expr *p){
       return ExprHasProperty(p, EP_CanBeNull) ||
              p->y.pTab==0 ||  /* Reference to column of index on expression */
              (p->iColumn>=0
-              && ALWAYS(p->y.pTab->aCol!=0) /* Defense against OOM problems */
+              && p->y.pTab->aCol!=0 /* Possible due to prior error */
               && p->y.pTab->aCol[p->iColumn].notNull==0);
     default:
       return 1;