diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-04 19:15:35 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-08-04 19:15:35 -0700 |
| commit | 0065d05491ce5981ea20896bb26d21dcd31e6769 (patch) | |
| tree | 13240167319d4a99ab5eacae4a883258eb2d28de /src/fns.c | |
| parent | 18ab493650d648ab8dca651ea2698861f926e895 (diff) | |
| download | emacs-0065d05491ce5981ea20896bb26d21dcd31e6769.tar.gz emacs-0065d05491ce5981ea20896bb26d21dcd31e6769.tar.bz2 emacs-0065d05491ce5981ea20896bb26d21dcd31e6769.zip | |
Adjust in response to jan.h.d's comments.
See, for example <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9196#26>.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/fns.c b/src/fns.c index e5538d6acbc..a3af6b8c15a 100644 --- a/src/fns.c +++ b/src/fns.c @@ -602,12 +602,7 @@ concat (ptrdiff_t nargs, Lisp_Object *args, prev = Qnil; if (STRINGP (val)) - { - if (min (PTRDIFF_MAX, SIZE_MAX) / sizeof *textprops < nargs) - memory_full (SIZE_MAX); - SAFE_ALLOCA (textprops, struct textprop_rec *, - sizeof *textprops * nargs); - } + SAFE_NALLOCA (textprops, 1, nargs); for (argnum = 0; argnum < nargs; argnum++) { |