Remove Window objects from the corresponding Select.pWin list when they are deleted.
FossilOrigin-Name: d23f33168222dfa40a67dc7de58057418151989e81429e4af47617e86db04667
diff --git a/src/expr.c b/src/expr.c
index 56b3148..571e9e4 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -1326,10 +1326,17 @@
*/
static int gatherSelectWindowsCallback(Walker *pWalker, Expr *pExpr){
if( pExpr->op==TK_FUNCTION && ExprHasProperty(pExpr, EP_WinFunc) ){
- assert( pExpr->y.pWin );
+ Select *pSelect = pWalker->u.pSelect;
+ Window *pWin = pExpr->y.pWin;
+ assert( pWin );
assert( IsWindowFunc(pExpr) );
- pExpr->y.pWin->pNextWin = pWalker->u.pSelect->pWin;
- pWalker->u.pSelect->pWin = pExpr->y.pWin;
+ if( pSelect->pWin ){
+ *pSelect->pWin->ppThis = pSelect->pWin->pNextWin;
+ pSelect->pWin->ppThis = &pWin->pNextWin;
+ }
+ pWin->pNextWin = pSelect->pWin;
+ pWin->ppThis = &pSelect->pWin;
+ pSelect->pWin = pWin;
}
return WRC_Continue;
}