From: drh <drh@noemail.net>
Date: Mon, 2 Jan 2017 23:18:35 +0000 (+0000)
Subject: Put an ALWAYS() on an unreachable branch in the sqlite3ExprListDup() routine.
X-Git-Tag: version-3.17.0~144^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f50bb84f55e33df406bc69d2369a4bec223ef4e;p=thirdparty%2Fsqlite.git

Put an ALWAYS() on an unreachable branch in the sqlite3ExprListDup() routine.

FossilOrigin-Name: 2caaaab5e07f6b76d66fbe4e93a4b956937427d8
---

diff --git a/manifest b/manifest
index 96cb82ef9a..4e23e69744 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Proposed\sfix\sfor\sthe\srow-value\sTRIGGER\sUPDATE\sproblem\sdescribed\sin\s\nticket\s[8c9458e7].
-D 2017-01-02T22:36:32.292
+C Put\san\sALWAYS()\son\san\sunreachable\sbranch\sin\sthe\ssqlite3ExprListDup()\sroutine.
+D 2017-01-02T23:18:35.959
 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -341,7 +341,7 @@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
 F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
 F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
 F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5
-F src/expr.c d438df533ef4dc803260527cee353d3d7df89ba3
+F src/expr.c c2be1c1ae369dc14ba9e76831466b3a494986872
 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
 F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
 F src/func.c d8582ee91975975645f206db332c38f534b783ad
@@ -1541,10 +1541,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 16415b5aad445c9e4e849018b48538d74eec8944
-R 0fc45eecde9c7ee8bfeff4a5566dee47
-T *branch * rowvalue-update-trigger
-T *sym-rowvalue-update-trigger *
-T -sym-trunk *
+P 61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0
+R 979198fba9d353741bbbde77f8690ab1
 U drh
-Z 681d88dc64ba5dba1f04ffca46eb2b75
+Z 3d9af2cb6ce914fdb21ee160bd6a1c90
diff --git a/manifest.uuid b/manifest.uuid
index 2e2ff06ae3..d239c8fce4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-61a442ea2ceec2cbd327dae0ff5214e1f3c69ec0
\ No newline at end of file
+2caaaab5e07f6b76d66fbe4e93a4b956937427d8
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index ebc9ca6b0c..072c420780 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1311,6 +1311,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
     Expr *pOldExpr = pOldItem->pExpr;
     Expr *pNewExpr;
     pItem->pExpr = sqlite3ExprDup(db, pOldExpr, flags);
+    assert( pItem->pExpr==0 || db->mallocFailed==0 );
     if( pOldExpr 
      && pOldExpr->op==TK_SELECT_COLUMN
      && (pNewExpr = pItem->pExpr)!=0 
@@ -1319,7 +1320,7 @@ ExprList *sqlite3ExprListDup(sqlite3 *db, ExprList *p, int flags){
       if( pNewExpr->iColumn==0 ){
         assert( pOldExpr->pLeft==pOldExpr->pRight );
         pNewExpr->pLeft = pNewExpr->pRight;
-      }else if( pItem[-1].pExpr!=0 ){
+      }else if( ALWAYS(pItem[-1].pExpr!=0) ){
         pNewExpr->pLeft = pItem[-1].pExpr->pLeft;
       }
     }