diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-24 19:01:14 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-09-24 19:01:14 -0700 |
| commit | 10381f58949355413c86315c571508afb40f0de6 (patch) | |
| tree | 06761cfffeb1dcd54a633da833b7f0021f1b71c0 /src/fns.c | |
| parent | 59355ea9ce310eb45b33e10f2ffaedbc4e2f47a9 (diff) | |
| download | emacs-10381f58949355413c86315c571508afb40f0de6.tar.gz | |
Fix local_cons etc. to not exhaust the stack when in a loop.
Problem reported in:
http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00696.html
* buffer.c (Fother_buffer, other_buffer_safely, init_buffer):
* charset.c (load_charset_map_from_file, Ffind_charset_region)
(Ffind_charset_string):
* chartab.c (uniprop_encode_value_numeric, uniprop_table):
* data.c (wrong_range):
* editfns.c (Fpropertize, format2):
* emacs.c (init_cmdargs, decode_env_path):
* fileio.c (auto_save_error):
* fns.c (Fyes_or_no_p):
* font.c (font_style_to_value, font_parse_xlfd)
(font_parse_family_registry, font_delete_unmatched)
(font_add_log):
* fontset.c (Fset_fontset_font):
* frame.c (x_get_arg):
* keyboard.c (echo_dash, safe_run_hooks_error, parse_menu_item)
(read_char_minibuf_menu_prompt):
* keymap.c (silly_event_symbol_error, describe_vector):
* lread.c (load_warn_old_style_backquotes):
* menu.c (single_menu_item):
* minibuf.c (Fread_buffer):
* process.c (status_message, Fformat_network_address)
(server_accept_connection):
* textprop.c (copy_text_properties):
* xdisp.c (Fcurrent_bidi_paragraph_direction):
* xfns.c (x_default_scroll_bar_color_parameter):
* xfont.c (xfont_open):
* xselect.c (x_clipboard_manager_error_1):
* xterm.c (x_term_init):
Put USE_LOCAL_ALLOCA at the start of the function.
* fns.c (maybe_resize_hash_table): Use build_string instead of
build_local_string, since we'd otherwise need a conditional
USE_LOCAL_ALLOCA here, but this is just debugging output and is
not worth the bother of optimization.
* font.c (font_delete_unmatched): Remove by-hand code that
observed MAX_ALLOCA limit, since it's now done automatically.
* keymap.c (Fsingle_key_description): Put USE_SAFE_ALLOCA at top,
since build_local_string needs its sa_alloc.
* lisp.h (lisp_word_count): New function.
(SAFE_ALLOCA_LISP): Use it.
(USE_LOCAL_ALLOCA): New macro.
(local_cons, make_local_vector, make_local_string):
Observe the MAX_ALLOCA limit.
(LISP_STRING_OVERHEAD): New constant.
(make_local_string): Use it.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/fns.c b/src/fns.c index 2ddff0fa818..a4836ace68c 100644 --- a/src/fns.c +++ b/src/fns.c @@ -2706,7 +2706,8 @@ If dialog boxes are supported, a dialog box will be used if `last-nonmenu-event' is nil, and `use-dialog-box' is non-nil. */) (Lisp_Object prompt) { - register Lisp_Object ans; + USE_LOCAL_ALLOCA; + Lisp_Object ans; struct gcpro gcpro1; CHECK_STRING (prompt); @@ -3996,7 +3997,7 @@ maybe_resize_hash_table (struct Lisp_Hash_Table *h) if (HASH_TABLE_P (Vpurify_flag) && XHASH_TABLE (Vpurify_flag) == h) Fmessage (2, ((Lisp_Object []) - { build_local_string ("Growing hash table to: %d"), + { build_string ("Growing hash table to: %d"), make_number (new_size) })); #endif |