procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Protect against GCing of last_mouse_window

Browse source 
* src/window.c (last_mouse_window): New global var.  All static
instances removed, and all their uses replaced with this global
var.  This fixes a very unlikely bug where last_mouse_window was
GC’ed and a new window created in its place.  It also fixes several
places that assumed NIL_IS_ZERO without static_asserting it.
(init_window_once): Initialize the new var.
This commit is contained in:
Paul Eggert 2025-01-26 22:15:49 -08:00
parent ff65cc9944
commit 2e8ef09104
9 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/androidterm.c
View file

@ -1179,7 +1179,6 @@ handle_one_android_event (struct android_display_info *dpyinfo,
&& (f == XFRAME (selected_frame)
|| !NILP (focus_follows_mouse)))
{
static Lisp_Object last_mouse_window;
Lisp_Object window
= window_from_coordinates (f, event->xmotion.x,
event->xmotion.y, 0,

1
src/haikuterm.c
View file

@ -3562,7 +3562,6 @@ haiku_read_socket (struct terminal *terminal, struct input_event *hold_quit)
if (!NILP (Vmouse_autoselect_window))
{
static Lisp_Object last_mouse_window;
Lisp_Object window = window_from_coordinates (f, b->x, b->y, 0, 0, 0, 0);
if (WINDOWP (window)

2
src/msdos.c
View file

@ -2677,8 +2677,6 @@ dos_rawgetc (void)
/* Generate SELECT_WINDOW_EVENTs when needed. */
if (!NILP (Vmouse_autoselect_window))
{
static Lisp_Object last_mouse_window;
mouse_window = window_from_coordinates
(SELECTED_FRAME (), mouse_last_x, mouse_last_y, 0, 0, 0, 0);
/* A window will be selected only when it is not

1
src/pgtkterm.c
View file

@ -5938,7 +5938,6 @@ motion_notify_event (GtkWidget *widget, GdkEvent *event,
also when the target window is on another frame. */
&& (f == XFRAME (selected_frame) || !NILP (focus_follows_mouse)))
{
static Lisp_Object last_mouse_window;
Lisp_Object window = window_from_coordinates
(f, event->motion.x, event->motion.y, 0, false, false, false);

1
src/w32inevt.c
View file

@ -467,7 +467,6 @@ do_mouse_event (MOUSE_EVENT_RECORD *event,
struct input_event *emacs_ev)
{
static DWORD button_state = 0;
static Lisp_Object last_mouse_window;
DWORD but_change, mask, flags = event->dwEventFlags;
int i;

1
src/w32term.c
View file

@ -5444,7 +5444,6 @@ w32_read_socket (struct terminal *terminal,
|| (!NILP (focus_follows_mouse)
&& !FRAME_NO_ACCEPT_FOCUS (f))))
{
static Lisp_Object last_mouse_window;
Lisp_Object window = window_from_coordinates
(f, LOWORD (msg.msg.lParam), HIWORD (msg.msg.lParam), 0, 0, 0, 0);

6
src/window.c
View file

@ -106,6 +106,9 @@ Lisp_Object minibuf_window;
shown as the selected window when the minibuffer is selected. */
Lisp_Object minibuf_selected_window;
/* Non-nil means it is the window containing the last mouse movement. */
Lisp_Object last_mouse_window;
/* Incremented for each window created. */
static EMACS_INT sequence_number;
@ -8778,6 +8781,8 @@ init_window_once (void)
minibuf_selected_window = Qnil;
staticpro (&minibuf_selected_window);
last_mouse_window = Qnil;
staticpro (&last_mouse_window);
old_selected_window = Qnil;
staticpro (&old_selected_window);
@ -8796,6 +8801,7 @@ static void init_window_once_for_pdumper (void)
PDUMPER_RESET_LV (selected_window, Qnil);
PDUMPER_RESET_LV (Vwindow_list, Qnil);
PDUMPER_RESET_LV (minibuf_selected_window, Qnil);
PDUMPER_RESET_LV (last_mouse_window, Qnil);
/* Hack: if mode_line_in_non_selected_windows is true (which it may
be, if we're restoring from a dump) the guts of

4
src/window.h
View file

@ -1116,6 +1116,10 @@ extern Lisp_Object minibuf_window;
extern Lisp_Object minibuf_selected_window;
/* Non-nil means it is the window containing the last mouse movement. */
extern Lisp_Object last_mouse_window;
extern Lisp_Object make_window (void);
extern Lisp_Object window_from_coordinates (struct frame *, int, int,
enum window_part *, bool, bool, bool);

3
src/xterm.c
View file

@ -21291,8 +21291,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
&& (f == XFRAME (selected_frame)
|| !NILP (focus_follows_mouse)))
{
static Lisp_Object last_mouse_window;
if (xmotion.window != FRAME_X_WINDOW (f))
{
x_translate_coordinates (f, xmotion.x_root, xmotion.y_root,
@ -23231,7 +23229,6 @@ handle_one_xevent (struct x_display_info *dpyinfo,
&& (f == XFRAME (selected_frame)
|| !NILP (focus_follows_mouse)))
{
static Lisp_Object last_mouse_window;
Lisp_Object window = window_from_coordinates (f, ev.x, ev.y, 0, false, false,
false);