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

Handle allocation errors when interning large amounts of atoms

Browse source 
* src/xfns.c (Fx_begin_drag): Catch BadAlloc errors around
XInternAtoms.
This commit is contained in:
Po Lu 2022-06-11 11:13:48 +08:00
parent 46e6b8a1e4
commit 9c27c7f7ce
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/xfns.c
View file

@ -6982,10 +6982,14 @@ that mouse buttons are being held down, such as immediately after a
target_atoms = SAFE_ALLOCA (ntargets * sizeof *target_atoms);
block_input ();
/* Catch errors since interning lots of targets can potentially
generate a BadAlloc error. */
x_catch_errors (FRAME_X_DISPLAY (f));
XInternAtoms (FRAME_X_DISPLAY (f), target_names,
ntargets, False, target_atoms);
unblock_input ();
x_check_errors (FRAME_X_DISPLAY (f),
"Failed to intern target atoms: %s");
x_uncatch_errors_after_check ();
lval = x_dnd_begin_drag_and_drop (f, FRAME_DISPLAY_INFO (f)->last_user_time,
xaction, return_frame, action_list,