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

Avoid unsafe alloca when looking up toplevels

Browse source 
* src/xterm.c (x_dnd_compute_toplevels): Use SAFE_ALLOCA, since
alloca isn't safe when there are lots of toplevels or the window
manager is broken.
This commit is contained in:
Po Lu 2022-05-14 20:07:27 +08:00
parent 9a67e83bd6
commit e0044dfeb0
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/xterm.c
View file

@ -2106,27 +2106,29 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
toplevels = (Window *) data;
#ifdef USE_XCB
USE_SAFE_ALLOCA;
window_attribute_cookies
= alloca (sizeof *window_attribute_cookies * nitems);
= SAFE_ALLOCA (sizeof *window_attribute_cookies * nitems);
translate_coordinate_cookies
= alloca (sizeof *translate_coordinate_cookies * nitems);
= SAFE_ALLOCA (sizeof *translate_coordinate_cookies * nitems);
get_property_cookies
= alloca (sizeof *get_property_cookies * nitems);
= SAFE_ALLOCA (sizeof *get_property_cookies * nitems);
xm_property_cookies
= alloca (sizeof *xm_property_cookies * nitems);
= SAFE_ALLOCA (sizeof *xm_property_cookies * nitems);
extent_property_cookies
= alloca (sizeof *extent_property_cookies * nitems);
= SAFE_ALLOCA (sizeof *extent_property_cookies * nitems);
get_geometry_cookies
= alloca (sizeof *get_geometry_cookies * nitems);
= SAFE_ALLOCA (sizeof *get_geometry_cookies * nitems);
#ifdef HAVE_XCB_SHAPE
bounding_rect_cookies
= alloca (sizeof *bounding_rect_cookies * nitems);
= SAFE_ALLOCA (sizeof *bounding_rect_cookies * nitems);
#endif
#ifdef HAVE_XCB_SHAPE_INPUT_RECTS
input_rect_cookies
= alloca (sizeof *input_rect_cookies * nitems);
= SAFE_ALLOCA (sizeof *input_rect_cookies * nitems);
#endif
for (i = 0; i < nitems; ++i)
@ -2606,6 +2608,10 @@ x_dnd_compute_toplevels (struct x_display_info *dpyinfo)
#endif
}
#ifdef USE_XCB
SAFE_FREE ();
#endif
return 0;
}