vim: src/buffer.c comparison

comparison src/buffer.c @ 23624:f9d02c83f306 v8.2.2354

patch 8.2.2354: crash with a weird combination of autocommands Commit: https://github.com/vim/vim/commit/797e63b9f2baa1853e7063aac478d663cd02f207 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 15 16:22:52 2021 +0100 patch 8.2.2354: crash with a weird combination of autocommands Problem: Crash with a weird combination of autocommands. Solution: Increment b_nwindows when needed. (closes https://github.com/vim/vim/issues/7674)

author	Bram Moolenaar <Bram@vim.org>
date	Fri, 15 Jan 2021 16:30:04 +0100
parents	9a5f12b36273
children	29eccef07e2f

comparison

equal deleted inserted replaced

-:905ba483e284
+:f9d02c83f306
 * When "abort_if_last" is TRUE then do not close the buffer if autocommands
 * cause there to be only one window with this buffer.  e.g. when ":quit" is
 * supposed to close the window but autocommands close all other windows.
 *
 * When "ignore_abort" is TRUE don't abort even when aborting() returns TRUE.
-*/
+*
-void
+* Return TRUE when we got to the end and b_nwindows was decremented.
+*/
+int
 close_buffer(
 win_T	*win,		// if not NULL, set b_last_cursor
 buf_T	*buf,
 int		action,
 int		abort_if_last,
 	if (term_job_running(buf->b_term))
 	{
 	    if (wipe_buf || unload_buf)
 	    {
 		if (!can_unload_buffer(buf))
-		    return;
+		    return FALSE;
 		// Wiping out or unloading a terminal buffer kills the job.
 		free_terminal(buf);
 	    }
 	    else
 #endif
 // Disallow deleting the buffer when it is locked (already being closed or
 // halfway a command that relies on it). Unloading is allowed.
 if ((del_buf || wipe_buf) && !can_unload_buffer(buf))
-	return;
+	return FALSE;
 // check no autocommands closed the window
 if (win != NULL && win_valid_any_tab(win))
 {
 	// Set b_last_cursor when closing the last window for the buffer.
 		&& !bufref_valid(&bufref))
 	{
 	    // Autocommands deleted the buffer.
 aucmd_abort:
 	    emsg(_(e_auabort));
-	    return;
+	    return FALSE;
 	}
 	--buf->b_locked;
 	if (abort_if_last && one_window())
 	    // Autocommands made this the only window.
 	    goto aucmd_abort;
 		goto aucmd_abort;
 	}
 #ifdef FEAT_EVAL
 	// autocmds may abort script processing
 	if (!ignore_abort && aborting())
-	    return;
+	    return FALSE;
 #endif
 }
 // If the buffer was in curwin and the window has changed, go back to that
 // window, if it still exists.  This avoids that ":edit x" triggering a
 #endif
 // Return when a window is displaying the buffer or when it's not
 // unloaded.
 if (buf->b_nwindows > 0 || !unload_buf)
-	return;
+	return FALSE;
 // Always remove the buffer when there is no file name.
 if (buf->b_ffname == NULL)
 	del_buf = TRUE;
 		   + (wipe_buf ? BFA_WIPE : 0)
 		   + (ignore_abort ? BFA_IGNORE_ABORT : 0));
 // Autocommands may have deleted the buffer.
 if (!bufref_valid(&bufref))
-	return;
+	return FALSE;
 #ifdef FEAT_EVAL
 // autocmds may abort script processing
 if (!ignore_abort && aborting())
-	return;
+	return FALSE;
 #endif
 /*
 * It's possible that autocommands change curbuf to the one being deleted.
 * This might cause the previous curbuf to be deleted unexpectedly.  But
 * in some cases it's OK to delete the curbuf, because a new one is
 * obtained anyway.  Therefore only return if curbuf changed to the
 * deleted buffer.
 */
 if (buf == curbuf && !is_curbuf)
-	return;
+	return FALSE;
 if (win_valid_any_tab(win) && win->w_buffer == buf)
 	win->w_buffer = NULL;  // make sure we don't use the buffer now
 // Autocommands may have opened or closed windows for this buffer.
 	buf_clear_file(buf);
 	if (del_buf)
 	    buf->b_p_bl = FALSE;
 }
 // NOTE: at this point "curbuf" may be invalid!
+return TRUE;
 }
 /*
 * Make buffer not contain a file.
 */

Mercurial > vim

comparison src/buffer.c @ 23624:f9d02c83f306 v8.2.2354