diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-12-30 14:08:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-12-30 14:08:35 +0100 |
| commit | 2808da39f9aad674d25df784da636e42372b78e3 (patch) | |
| tree | 08020269eccff6756f75e3e855cdf1172efc85c9 | |
| parent | 467676d468cb10db78d79d5bd2139ded9f70d26f (diff) | |
patch 8.2.2248: ASAN error on exit with GUIv8.2.2248
Problem: ASAN error on exit with GUI.
Solution: Check the window still has lines. (Christian Brabandt,
closes #7573)
| -rw-r--r-- | src/term.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/term.c b/src/term.c index bb4bad1c96..9e9a67b921 100644 --- a/src/term.c +++ b/src/term.c @@ -3411,9 +3411,10 @@ set_shellsize(int width, int height, int mustset) return; // curwin->w_buffer can be NULL when we are closing a window and the - // buffer has already been closed and removing a scrollbar causes a resize - // event. Don't resize then, it will happen after entering another buffer. - if (curwin->w_buffer == NULL) + // buffer (or window) has already been closed and removing a scrollbar + // causes a resize event. Don't resize then, it will happen after entering + // another buffer. + if (curwin->w_buffer == NULL || curwin->w_lines == NULL) return; ++busy; diff --git a/src/version.c b/src/version.c index 27907d721e..4e30cdafb9 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2248, +/**/ 2247, /**/ 2246, |