Mercurial > emacs
changeset 109278:d14945d39811
* alloc.c (Fmake_byte_code): Don't access undefined argument (Bug#6517).
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 26 Jun 2010 20:47:35 +0200 |
| parents | 8591e48339c7 |
| children | 4369f3a9c1de |
| files | src/ChangeLog src/alloc.c |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jun 25 14:42:47 2010 +0300 +++ b/src/ChangeLog Sat Jun 26 20:47:35 2010 +0200 @@ -1,3 +1,8 @@ +2010-06-26 Andreas Schwab <schwab@linux-m68k.org> + + * alloc.c (Fmake_byte_code): Don't access undefined argument + (Bug#6517). + 2010-06-25 Chong Yidong <cyd@stupidchicken.com> * xdisp.c (next_element_from_image): Ensure that after-strings are
--- a/src/alloc.c Fri Jun 25 14:42:47 2010 +0300 +++ b/src/alloc.c Sat Jun 26 20:47:35 2010 +0200 @@ -3094,7 +3094,7 @@ else val = Fmake_vector (len, Qnil); - if (STRINGP (args[1]) && STRING_MULTIBYTE (args[1])) + if (nargs > 1 && STRINGP (args[1]) && STRING_MULTIBYTE (args[1])) /* BYTECODE-STRING must have been produced by Emacs 20.2 or the earlier because they produced a raw 8-bit string for byte-code and now such a byte-code string is loaded as multibyte while