diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-10-20 22:27:10 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-10-20 22:27:10 +0200 |
| commit | 34ba06b6e6f94bb46062e6c85dbfdcbb0d255ada (patch) | |
| tree | adaa0efb9603a9b9822d6f3e116a783666f18f1f /src/ex_docmd.c | |
| parent | d53ebfc6246b2f29752adbda13cd2c11acca285a (diff) | |
patch 8.1.2197: ExitPre autocommand may cause accessing freed memoryv8.1.2197
Problem: ExitPre autocommand may cause accessing freed memory.
Solution: Check the window pointer is still valid. (closes #5093)
Diffstat (limited to 'src/ex_docmd.c')
| -rw-r--r-- | src/ex_docmd.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index d9fe7de75e..385cf3b4ae 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4817,9 +4817,9 @@ before_quit_autocmds(win_T *wp, int quit_all, int forceit) { apply_autocmds(EVENT_QUITPRE, NULL, NULL, FALSE, wp->w_buffer); - /* Bail out when autocommands closed the window. - * Refuse to quit when the buffer in the last window is being closed (can - * only happen in autocommands). */ + // Bail out when autocommands closed the window. + // Refuse to quit when the buffer in the last window is being closed (can + // only happen in autocommands). if (!win_valid(wp) || curbuf_locked() || (wp->w_buffer->b_nwindows == 1 && wp->w_buffer->b_locked > 0)) @@ -4828,9 +4828,10 @@ before_quit_autocmds(win_T *wp, int quit_all, int forceit) if (quit_all || (check_more(FALSE, forceit) == OK && only_one_window())) { apply_autocmds(EVENT_EXITPRE, NULL, NULL, FALSE, curbuf); - /* Refuse to quit when locked or when the buffer in the last window is - * being closed (can only happen in autocommands). */ - if (curbuf_locked() + // Refuse to quit when locked or when the window was closed or the + // buffer in the last window is being closed (can only happen in + // autocommands). + if (!win_valid(wp) || curbuf_locked() || (curbuf->b_nwindows == 1 && curbuf->b_locked > 0)) return TRUE; } |