diff options
| author | drh <> | 2021-10-12 18:05:55 +0000 |
|---|---|---|
| committer | drh <> | 2021-10-12 18:05:55 +0000 |
| commit | ffa5b054ddbdffd93d6d1215a8eddffc6a40398d (patch) | |
| tree | 0df053c3a8e013a67ae3b3a5374feb6f03c93dcd /src | |
| parent | dee0359ddbb890e26e6d61f21b4e26361c3b8712 (diff) | |
| download | sqlite-ffa5b054ddbdffd93d6d1215a8eddffc6a40398d.tar.gz sqlite-ffa5b054ddbdffd93d6d1215a8eddffc6a40398d.zip | |
Fix an incorrect assert() in SQLITE_ENABLE_SORTER_REFERENCES logic - a new
assert() introduced 5 days ago by [87e2f5eb436fc448].
FossilOrigin-Name: 7cfc839e5f1f28514cba7d11b0c0eb56d5ea65caacb8893dcf9fcf2d409e2ba5
Diffstat (limited to 'src')
| -rw-r--r-- | src/select.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/select.c b/src/select.c index d437283a4..33c8b2762 100644 --- a/src/select.c +++ b/src/select.c @@ -942,10 +942,12 @@ static void selectExprDefer( if( pItem->u.x.iOrderByCol==0 ){ Expr *pExpr = pItem->pExpr; Table *pTab; - assert( ExprUseYTab(pExpr) ); - pTab = pExpr->y.pTab; - if( pExpr->op==TK_COLUMN && pExpr->iColumn>=0 && pTab && !IsVirtual(pTab) - && (pTab->aCol[pExpr->iColumn].colFlags & COLFLAG_SORTERREF) + if( pExpr->op==TK_COLUMN + && pExpr->iColumn>=0 + && ALWAYS( ExprUseYTab(pExpr) ) + && (pTab = pExpr->y.pTab)!=0 + && IsOrdinaryTable(pTab) + && (pTab->aCol[pExpr->iColumn].colFlags & COLFLAG_SORTERREF)!=0 ){ int j; for(j=0; j<nDefer; j++){ |