Commit a498d7f4 authored by Paul Eggert's avatar Paul Eggert

* fns.c (concat): Catch string overflow earlier.

Do not rely on integer wraparound.
parent e39e811e
2011-06-18 Paul Eggert <eggert@cs.ucla.edu> 2011-06-18 Paul Eggert <eggert@cs.ucla.edu>
* fns.c (concat): Catch string overflow earlier.
Do not rely on integer wraparound.
* dispextern.h (struct it.overlay_strings_charpos): EMACS_INT, not int. * dispextern.h (struct it.overlay_strings_charpos): EMACS_INT, not int.
2011-06-17 Paul Eggert <eggert@cs.ucla.edu> 2011-06-17 Paul Eggert <eggert@cs.ucla.edu>
......
...@@ -565,8 +565,8 @@ concat (ptrdiff_t nargs, Lisp_Object *args, ...@@ -565,8 +565,8 @@ concat (ptrdiff_t nargs, Lisp_Object *args,
} }
result_len += len; result_len += len;
if (result_len < 0) if (STRING_BYTES_BOUND < result_len)
error ("String overflow"); string_overflow ();
} }
if (! some_multibyte) if (! some_multibyte)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment