diff options
| author | Paul Eggert | 2014-09-07 00:04:01 -0700 |
|---|---|---|
| committer | Paul Eggert | 2014-09-07 00:04:01 -0700 |
| commit | b3bf18b3b87ac8f00857b8bfc3f2c74cf0e2fb7d (patch) | |
| tree | cf138164e4f8887394f52cb22da594d1713da316 /src/term.c | |
| parent | 930fb80f9e2815e599eb1de699668d42e305fa21 (diff) | |
| download | emacs-b3bf18b3b87ac8f00857b8bfc3f2c74cf0e2fb7d.tar.gz emacs-b3bf18b3b87ac8f00857b8bfc3f2c74cf0e2fb7d.zip | |
Use SAFE_ALLOCA etc. to avoid unbounded stack allocation.
This follows up on the recent thread in emacs-devel on alloca; see:
http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00042.html
This patch also cleans up alloca-related glitches noted while
examining the code looking for unbounded alloca.
* alloc.c (listn):
* callproc.c (init_callproc):
Rewrite to avoid need for alloca.
* buffer.c (mouse_face_overlay_overlaps)
(report_overlay_modification):
* buffer.h (GET_OVERLAYS_AT):
* coding.c (make_subsidiaries):
* doc.c (Fsnarf_documentation):
* editfns.c (Fuser_full_name):
* fileio.c (Ffile_name_directory, Fexpand_file_name)
(search_embedded_absfilename, Fsubstitute_in_file_name):
* fns.c (Fmake_hash_table):
* font.c (font_vconcat_entity_vectors, font_update_drivers):
* fontset.c (fontset_pattern_regexp, Ffontset_info):
* frame.c (Fmake_terminal_frame, x_set_frame_parameters)
(xrdb_get_resource, x_get_resource_string):
* ftfont.c (ftfont_get_charset, ftfont_check_otf, ftfont_drive_otf):
* ftxfont.c (ftxfont_draw):
* image.c (xbm_load, xpm_load, jpeg_load_body):
* keyboard.c (echo_add_key, menu_bar_items, tool_bar_items):
* keymap.c (Fdescribe_buffer_bindings, describe_map):
* lread.c (openp):
* menu.c (digest_single_submenu, find_and_call_menu_selection)
(find_and_return_menu_selection):
* print.c (PRINTFINISH):
* process.c (Fformat_network_address):
* scroll.c (do_scrolling, do_direct_scrolling, scrolling_1):
* search.c (search_buffer, Fmatch_data, Fregexp_quote):
* sound.c (wav_play, au_play):
* syntax.c (skip_chars):
* term.c (tty_menu_activate, tty_menu_show):
* textprop.c (get_char_property_and_overlay):
* window.c (Fset_window_configuration):
* xdisp.c (safe__call, next_overlay_change, vmessage)
(compute_overhangs_and_x, draw_glyphs, note_mouse_highlight):
* xfaces.c (face_at_buffer_position):
* xmenu.c (x_menu_show):
Use SAFE_ALLOCA etc. instead of plain alloca, since the
allocation size isn't bounded.
* callint.c (Fcall_interactively): Redo memory_full check
so that it can be done at compile-time on some platforms.
* coding.c (MAX_LOOKUP_MAX): New constant.
(get_translation_table): Use it.
* callproc.c (call_process): Use SAFE_NALLOCA instead of
SAFE_ALLOCA, to catch integer overflows on size calculation.
(exec_failed) [!DOS_NT]: New function.
(child_setup) [!DOS_NT]: Use it.
* editfns.c (Ftranspose_regions):
Hoist USE_SAFE_ALLOC + SAFE_FREE out of 'if'.
* editfns.c (check_translation):
Allocate larger buffers on the heap.
* eval.c (internal_lisp_condition_case):
Check for MAX_ALLOCA overflow.
* fns.c (sort_vector): Use SAFE_ALLOCA_LISP rather than Fmake_vector.
(Fbase64_encode_region, Fbase64_decode_region):
Avoid unnecessary calls to SAFE_FREE before 'error'.
* buffer.c (mouse_face_overlay_overlaps):
* editfns.c (Fget_pos_property, check_translation):
* eval.c (Ffuncall):
* font.c (font_unparse_xlfd, font_find_for_lface):
* ftfont.c (ftfont_drive_otf):
* keyboard.c (echo_add_key, read_decoded_event_from_main_queue)
(menu_bar_items, tool_bar_items):
* sound.c (Fplay_sound_internal):
* xdisp.c (load_overlay_strings, dump_glyph_row):
Use an ordinary auto buffer rather than alloca, since the
allocation size is fixed and small.
* ftfont.c: Include <c-strcase.h>.
(matching_prefix): New function.
(get_adstyle_property): Use it, to avoid need for alloca.
* keyboard.c (echo_add_key):
* keymap.c (describe_map): Use ptrdiff_t, not int.
* keyboard.c (echo_add_key): Prefer sizeof to strlen.
* keymap.c (Fdescribe_buffer_bindings): Use SBYTES, not SCHARS,
when counting bytes.
* lisp.h (xlispstrdupa): Remove, replacing with ...
(SAFE_ALLOCA_STRING): ... new macro with different API.
This fixes a portability problem, namely, alloca result
passed to another function. All uses changed.
(SAFE_ALLOCA, SAFE_ALLOCA_LISP): Check for MAX_ALLOCA,
not MAX_ALLOCA - 1.
* regex.c (REGEX_USE_SAFE_ALLOCA, REGEX_SAFE_FREE)
(REGEX_ALLOCATE): New macros.
(REGEX_REALLOCATE, REGEX_ALLOCATE_STACK, REGEX_REALLOCATE_STACK)
(REGEX_FREE_STACK, FREE_VARIABLES, re_match_2_internal):
Use them.
* xdisp.c (message3): Use SAFE_ALLOCA_STRING rather than doing it
by hand.
(decode_mode_spec_coding): Store directly into buf rather than
into an alloca temporary and copying the temporary to the buf.
Fixes: debbugs:18410
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/term.c b/src/term.c index af1b62ccaaf..0a1b3dd13e2 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -3191,6 +3191,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx, | |||
| 3191 | Lisp_Object selectface; | 3191 | Lisp_Object selectface; |
| 3192 | int first_item = 0; | 3192 | int first_item = 0; |
| 3193 | int col, row; | 3193 | int col, row; |
| 3194 | USE_SAFE_ALLOCA; | ||
| 3194 | 3195 | ||
| 3195 | /* Don't allow non-positive x0 and y0, lest the menu will wrap | 3196 | /* Don't allow non-positive x0 and y0, lest the menu will wrap |
| 3196 | around the display. */ | 3197 | around the display. */ |
| @@ -3199,7 +3200,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx, | |||
| 3199 | if (y0 <= 0) | 3200 | if (y0 <= 0) |
| 3200 | y0 = 1; | 3201 | y0 = 1; |
| 3201 | 3202 | ||
| 3202 | state = alloca (menu->panecount * sizeof (struct tty_menu_state)); | 3203 | SAFE_NALLOCA (state, 1, menu->panecount); |
| 3203 | memset (state, 0, sizeof (*state)); | 3204 | memset (state, 0, sizeof (*state)); |
| 3204 | faces[0] | 3205 | faces[0] |
| 3205 | = lookup_derived_face (sf, intern ("tty-menu-disabled-face"), | 3206 | = lookup_derived_face (sf, intern ("tty-menu-disabled-face"), |
| @@ -3421,6 +3422,7 @@ tty_menu_activate (tty_menu *menu, int *pane, int *selidx, | |||
| 3421 | discard_mouse_events (); | 3422 | discard_mouse_events (); |
| 3422 | if (!kbd_buffer_events_waiting ()) | 3423 | if (!kbd_buffer_events_waiting ()) |
| 3423 | clear_input_pending (); | 3424 | clear_input_pending (); |
| 3425 | SAFE_FREE (); | ||
| 3424 | return result; | 3426 | return result; |
| 3425 | } | 3427 | } |
| 3426 | 3428 | ||
| @@ -3606,6 +3608,7 @@ tty_menu_show (struct frame *f, int x, int y, int menuflags, | |||
| 3606 | item_y = y += f->top_pos; | 3608 | item_y = y += f->top_pos; |
| 3607 | 3609 | ||
| 3608 | /* Create all the necessary panes and their items. */ | 3610 | /* Create all the necessary panes and their items. */ |
| 3611 | USE_SAFE_ALLOCA; | ||
| 3609 | maxwidth = maxlines = lines = i = 0; | 3612 | maxwidth = maxlines = lines = i = 0; |
| 3610 | lpane = TTYM_FAILURE; | 3613 | lpane = TTYM_FAILURE; |
| 3611 | while (i < menu_items_used) | 3614 | while (i < menu_items_used) |
| @@ -3674,9 +3677,7 @@ tty_menu_show (struct frame *f, int x, int y, int menuflags, | |||
| 3674 | 3677 | ||
| 3675 | if (!NILP (descrip)) | 3678 | if (!NILP (descrip)) |
| 3676 | { | 3679 | { |
| 3677 | /* If alloca is fast, use that to make the space, | 3680 | item_data = SAFE_ALLOCA (maxwidth + SBYTES (descrip) + 1); |
| 3678 | to reduce gc needs. */ | ||
| 3679 | item_data = (char *) alloca (maxwidth + SBYTES (descrip) + 1); | ||
| 3680 | memcpy (item_data, SSDATA (item_name), SBYTES (item_name)); | 3681 | memcpy (item_data, SSDATA (item_name), SBYTES (item_name)); |
| 3681 | for (j = SCHARS (item_name); j < maxwidth; j++) | 3682 | for (j = SCHARS (item_name); j < maxwidth; j++) |
| 3682 | item_data[j] = ' '; | 3683 | item_data[j] = ' '; |
| @@ -3829,6 +3830,7 @@ tty_menu_show (struct frame *f, int x, int y, int menuflags, | |||
| 3829 | 3830 | ||
| 3830 | tty_menu_end: | 3831 | tty_menu_end: |
| 3831 | 3832 | ||
| 3833 | SAFE_FREE (); | ||
| 3832 | unbind_to (specpdl_count, Qnil); | 3834 | unbind_to (specpdl_count, Qnil); |
| 3833 | return entry; | 3835 | return entry; |
| 3834 | } | 3836 | } |