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

Do not rely on integer wraparound.

* fns.c (concat): Catch string overflow earlier.
Do not rely on integer wraparound.
a498d7f4 · Paul Eggert · e39e811e · a498d7f4 · a498d7f4
Commit a498d7f4 authored Jun 18, 2011 by Paul Eggert
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

src/ChangeLog src/ChangeLog +3 -0

src/fns.c src/fns.c +2 -2

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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.

 2011-06-17  Paul Eggert  <eggert@cs.ucla.edu>

--- a/src/fns.c
+++ b/src/fns.c
@@ -565,8 +565,8 @@ concat (ptrdiff_t nargs, Lisp_Object *args,
 	}

      result_len += len;
-      if (result_len < 0)
-	error ("String overflow");
+      if (STRING_BYTES_BOUND < result_len)
+	string_overflow ();
    }

  if (! some_multibyte)