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

Prevent errors when Lisp code asks for props of invalid windows

Browse source 
* src/xfns.c (Fx_window_property):
(Fx_window_property_attributes): Catch X errors.
This commit is contained in:
Po Lu 2022-05-24 21:01:14 +08:00
parent d63d633a68
commit 7c4a780721
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/xfns.c
View file

@ -7563,6 +7563,8 @@ if PROP has no value of TYPE (always a string in the MS Windows case). */)
}
block_input ();
x_catch_errors (FRAME_X_DISPLAY (f));
if (STRINGP (type))
{
if (strcmp ("AnyPropertyType", SSDATA (type)) == 0)
@ -7593,6 +7595,9 @@ if PROP has no value of TYPE (always a string in the MS Windows case). */)
&found);
}
x_check_errors (FRAME_X_DISPLAY (f),
"Can't retrieve window property: %s");
x_uncatch_errors_after_check ();
unblock_input ();
return prop_value;
@ -7638,6 +7643,7 @@ Otherwise, the return value is a vector with the following fields:
block_input ();
x_catch_errors (FRAME_X_DISPLAY (f));
prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SSDATA (prop), False);
rc = XGetWindowProperty (FRAME_X_DISPLAY (f), target_window,
prop_atom, 0, 0, False, AnyPropertyType,
@ -7668,6 +7674,10 @@ Otherwise, the return value is a vector with the following fields:
make_fixnum (bytes_remaining / (actual_format >> 3)));
}
x_check_errors (FRAME_X_DISPLAY (f),
"Can't retrieve window property: %s");
x_uncatch_errors_after_check ();
unblock_input ();
return prop_attr;
}