Fix crash due to uninitialized lastwp member of layout_cell, reported by

Balazs Kezes.
pull/1/head
nicm 2014-02-22 18:01:10 +00:00
parent c7f3599ebc
commit 315d45a0eb
2 changed files with 4 additions and 2 deletions

View File

@ -53,6 +53,7 @@ layout_create_cell(struct layout_cell *lcparent)
lc->yoff = UINT_MAX;
lc->wp = NULL;
lc->lastwp = NULL;
return (lc);
}

View File

@ -410,8 +410,9 @@ window_pane_active_set(struct window_pane *wp, struct window_pane *nextwp)
* Previously active pane, if any, must not be the same as the source
* pane.
*/
if (nextwp->layout_cell->parent != NULL) {
lastwp = nextwp->layout_cell->parent->lastwp;
lc = nextwp->layout_cell->parent;
if (lc != NULL && lc->lastwp != NULL) {
lastwp = lc->lastwp;
if (lastwp != wp && window_pane_visible(lastwp))
return (lastwp);
}