Mercurial > vim

comparison src/window.c @ 33862:242b964d6269 v9.0.2140

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.2140: [security]: use-after-free in win-enter Commit: https://github.com/vim/vim/commit/eec0c2b3a4cfab93dd8d4adaa60638d47a2bbc8a Author: Christian Brabandt <cb@256bit.org> Date: Tue Nov 28 22:03:48 2023 +0100 patch 9.0.2140: [security]: use-after-free in win-enter Problem: [security]: use-after-free in win-enter Solution: validate window pointer before calling win_enter() win_goto() may stop visual mode, if it is active. However, this may in turn trigger the ModeChanged autocommand, which could potentially free the wp pointer which was valid before now became stale and points to now freed memory. So before calling win_enter(), let's verify one more time, that the wp pointer still points to a valid window structure. Reported by @henices, thanks! Signed-off-by: Christian Brabandt <cb@256bit.org>
author Christian Brabandt <cb@256bit.org>
date Sun, 10 Dec 2023 15:16:01 +0100
parents 58c9f11eae5b
children f4d88db48a63
comparison
equal deleted inserted replaced
33861:e6c291944e18 33862:242b964d6269
5011 5011
5012 /* 5012 /*
5013 * Go to another window. 5013 * Go to another window.
5014 * When jumping to another buffer, stop Visual mode. Do this before 5014 * When jumping to another buffer, stop Visual mode. Do this before
5015 * changing windows so we can yank the selection into the '*' register. 5015 * changing windows so we can yank the selection into the '*' register.
5016 * (note: this may trigger ModeChanged autocommand!)
5016 * When jumping to another window on the same buffer, adjust its cursor 5017 * When jumping to another window on the same buffer, adjust its cursor
5017 * position to keep the same Visual area. 5018 * position to keep the same Visual area.
5018 */ 5019 */
5019 void 5020 void
5020 win_goto(win_T *wp) 5021 win_goto(win_T *wp)
5037 beep_flush(); 5038 beep_flush();
5038 return; 5039 return;
5039 } 5040 }
5040 5041
5041 if (wp->w_buffer != curbuf) 5042 if (wp->w_buffer != curbuf)
5043 // careful: triggers ModeChanged autocommand
5042 reset_VIsual_and_resel(); 5044 reset_VIsual_and_resel();
5043 else if (VIsual_active) 5045 else if (VIsual_active)
5044 wp->w_cursor = curwin->w_cursor; 5046 wp->w_cursor = curwin->w_cursor;
5047
5048 // autocommand may have made wp invalid
5049 if (!win_valid(wp))
5050 return;
5045 5051
5046 #ifdef FEAT_GUI 5052 #ifdef FEAT_GUI
5047 need_mouse_correct = TRUE; 5053 need_mouse_correct = TRUE;
5048 #endif 5054 #endif
5049 win_enter(wp, TRUE); 5055 win_enter(wp, TRUE);