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

Fix ungetc bug when reading an encoding error

Browse source 
* src/lread.c (readchar, read_emacs_mule_char): Fix off-by-one
error when reading an encoding error from a file, e.g., a symbol
in an .elc file whose name is "\360\220\200\360".
This commit is contained in:
Paul Eggert 2017-07-07 18:08:00 -07:00
parent c819c053ad
commit d2832063c3
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lread.c
View file

@ -340,14 +340,13 @@ readchar (Lisp_Object readcharfun, bool *multibyte)
len = BYTES_BY_CHAR_HEAD (c);
while (i < len)
{
c = (*readbyte) (-1, readcharfun);
buf[i++] = c = (*readbyte) (-1, readcharfun);
if (c < 0 || ! TRAILING_CODE_P (c))
{
while (--i > 1)
for (i -= c < 0; 0 < --i; )
(*readbyte) (buf[i], readcharfun);
return BYTE8_TO_CHAR (buf[0]);
}
buf[i++] = c;
}
return STRING_CHAR (buf);
}
@ -530,14 +529,13 @@ read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object rea
buf[i++] = c;
while (i < len)
{
c = (*readbyte) (-1, readcharfun);
buf[i++] = c = (*readbyte) (-1, readcharfun);
if (c < 0xA0)
{
while (--i > 1)
for (i -= c < 0; 0 < --i; )
(*readbyte) (buf[i], readcharfun);
return BYTE8_TO_CHAR (buf[0]);
}
buf[i++] = c;
}
if (len == 2)