procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Properly handle lambda as read function (bug 22961)

Browse source 
* src/lread.c (readchar): Be more strict about checking for
string in cons for read_vector.
(unreadchar): Likewise.
This commit is contained in:
Andreas Schwab 2016-03-09 19:40:00 +01:00
parent 1b9d6163b0
commit 711ca362e7
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/lread.c
View file

@ -264,7 +264,7 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
return c; return c;
} }
if (CONSP (readcharfun)) if (CONSP (readcharfun) && STRINGP (XCAR (readcharfun)))
{ {
/* This is the case that read_vector is reading from a unibyte /* This is the case that read_vector is reading from a unibyte
string that contains a byte sequence previously skipped string that contains a byte sequence previously skipped
@ -406,7 +406,7 @@ unreadchar (Lisp_Object readcharfun, int c)
read_from_string_index_byte read_from_string_index_byte
= string_char_to_byte (readcharfun, read_from_string_index); = string_char_to_byte (readcharfun, read_from_string_index);
} }
else if (CONSP (readcharfun)) else if (CONSP (readcharfun) && STRINGP (XCAR (readcharfun)))
{ {
unread_char = c; unread_char = c;
} }