mirror of
https://github.com/tmux/tmux.git
synced 2025-09-02 21:47:01 +00:00
Add some NULL checks, GitHub issue 4586.
This commit is contained in:
2
popup.c
2
popup.c
@ -349,6 +349,8 @@ popup_make_pane(struct popup_data *pd, enum layout_type type)
|
|||||||
window_unzoom(w, 1);
|
window_unzoom(w, 1);
|
||||||
|
|
||||||
lc = layout_split_pane(wp, type, -1, 0);
|
lc = layout_split_pane(wp, type, -1, 0);
|
||||||
|
if (lc == NULL)
|
||||||
|
return;
|
||||||
hlimit = options_get_number(s->options, "history-limit");
|
hlimit = options_get_number(s->options, "history-limit");
|
||||||
new_wp = window_add_pane(wp->window, NULL, hlimit, 0);
|
new_wp = window_add_pane(wp->window, NULL, hlimit, 0);
|
||||||
layout_assign_pane(lc, new_wp, 0);
|
layout_assign_pane(lc, new_wp, 0);
|
||||||
|
1
server.c
1
server.c
@ -72,6 +72,7 @@ server_set_marked(struct session *s, struct winlink *wl, struct window_pane *wp)
|
|||||||
cmd_find_clear_state(&marked_pane, 0);
|
cmd_find_clear_state(&marked_pane, 0);
|
||||||
marked_pane.s = s;
|
marked_pane.s = s;
|
||||||
marked_pane.wl = wl;
|
marked_pane.wl = wl;
|
||||||
|
if (wl != NULL)
|
||||||
marked_pane.w = wl->window;
|
marked_pane.w = wl->window;
|
||||||
marked_pane.wp = wp;
|
marked_pane.wp = wp;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user