mirrors
/
sqlite
mirror of https://github.com/sqlite/sqlite
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix more unreachable branches. 

FossilOrigin-Name: 6099c180db55396d6307538a5428ae5ef1b82d10
This commit is contained in:
drh 2016-08-24 17:49:07 +00:00
parent d0b67a8654
commit 321e828d03
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Add\sa\sNEVER()\son\san\sunreachable\sbranch\sin\scomparisonAffinity().
D 2016-08-24T15:37:31.592
C Fix\smore\sunreachable\sbranches.
D 2016-08-24T17:49:07.427
F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc d66d0395c38571aab3804f8db0fa20707ae4609a
@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
F src/expr.c c2d3844fb18e7659653e482060ee0c5d3ec5ed10
F src/expr.c 57b6d994d88d390a76ccb0ef81ea7b3bccf06fec
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@ -1520,7 +1520,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 f41a0391b732a8c4ad188163f34a0f4a22237bb5
R b0541cab67b62c886354064e8f5cfc4d
P 505a2f20eac62d4e170f003255c8984e4f3b0918
R 3bf744e7d3187456751558defe5b0a1e
U drh
Z e7d2fda8d9703a6fa7987d8b8853c395
Z 0d5e4686e1b28bbfaea275d793f60f16

2
manifest.uuid
View File

@ -1 +1 @@
505a2f20eac62d4e170f003255c8984e4f3b0918
6099c180db55396d6307538a5428ae5ef1b82d10

7
src/expr.c
View File

@ -542,10 +542,11 @@ static void codeVectorCompare(
regLeft = exprCodeSubselect(pParse, pLeft);
regRight = exprCodeSubselect(pParse, pRight);
for(i=0; i<nLeft; i++){
for(i=0; 1 /*Loop exits by "break"*/; i++){
int regFree1 = 0, regFree2 = 0;
Expr *pL, *pR;
int r1, r2;
assert( i>=0 && i<nLeft );
if( i>0 ) sqlite3ExprCachePush(pParse);
r1 = exprVectorRegister(pParse, pLeft, i, regLeft, &pL, &regFree1);
r2 = exprVectorRegister(pParse, pRight, i, regRight, &pR, &regFree2);
@ -1490,7 +1491,9 @@ ExprList *sqlite3ExprListAppendVector(
int n;
int i;
int iFirst = pList ? pList->nExpr : 0;
if( pColumns==0 ) goto vector_append_error;
/* pColumns can only be NULL due to an OOM but an OOM will cause an
** exit prior to this routine being invoked */
if( NEVER(pColumns==0) ) goto vector_append_error;
if( pExpr==0 ) goto vector_append_error;
n = sqlite3ExprVectorSize(pExpr);
if( pColumns->nId!=n ){