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

Fix crash in syntax.c after GC

Browse source 
Problem reported by Vincent Belaïche (Bug#23704).
* src/syntax.c (skip_chars): Recompute pointers into the
buffer after every call to update_syntax_table_forward,
as it can GC.
This commit is contained in:
Paul Eggert 2016-06-07 09:28:49 -07:00
parent 973ce5a123
commit 6e3adf8a4a
1 changed files with 24 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

59
src/syntax.c
View file

@ -2171,63 +2171,51 @@ skip_syntaxes (bool forwardp, Lisp_Object string, Lisp_Object lim)
ptrdiff_t start_point = PT; ptrdiff_t start_point = PT;
ptrdiff_t pos = PT; ptrdiff_t pos = PT;
ptrdiff_t pos_byte = PT_BYTE; ptrdiff_t pos_byte = PT_BYTE;
unsigned char *p = PT_ADDR, *endp, *stop; unsigned char *p, *endp, *stop;
if (forwardp)
{
endp = (XINT (lim) == GPT) ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));
stop = (pos < GPT && GPT < XINT (lim)) ? GPT_ADDR : endp;
}
else
{
endp = CHAR_POS_ADDR (XINT (lim));
stop = (pos >= GPT && GPT > XINT (lim)) ? GAP_END_ADDR : endp;
}
immediate_quit = 1; immediate_quit = 1;
SETUP_SYNTAX_TABLE (pos, forwardp ? 1 : -1); SETUP_SYNTAX_TABLE (pos, forwardp ? 1 : -1);
if (forwardp) if (forwardp)
{ {
if (multibyte) while (true)
{ {
while (1) p = BYTE_POS_ADDR (pos_byte);
endp = XINT (lim) == GPT ? GPT_ADDR : CHAR_POS_ADDR (XINT (lim));
stop = pos < GPT && GPT < XINT (lim) ? GPT_ADDR : endp;
do
{ {
int nbytes; int nbytes;
if (p >= stop) if (p >= stop)
{ {
if (p >= endp) if (p >= endp)
break; goto done;
p = GAP_END_ADDR; p = GAP_END_ADDR;
stop = endp; stop = endp;
} }
if (multibyte)
c = STRING_CHAR_AND_LENGTH (p, nbytes); c = STRING_CHAR_AND_LENGTH (p, nbytes);
else
c = *p, nbytes = 1;
if (! fastmap[SYNTAX (c)]) if (! fastmap[SYNTAX (c)])
break; goto done;
p += nbytes, pos++, pos_byte += nbytes; p += nbytes, pos++, pos_byte += nbytes;
UPDATE_SYNTAX_TABLE_FORWARD (pos); }
} while (!parse_sexp_lookup_properties
} || pos < gl_state.e_property);
else
{ update_syntax_table_forward (pos + gl_state.offset,
while (1) false, gl_state.object);
{
if (p >= stop)
{
if (p >= endp)
break;
p = GAP_END_ADDR;
stop = endp;
}
if (! fastmap[SYNTAX (*p)])
break;
p++, pos++, pos_byte++;
UPDATE_SYNTAX_TABLE_FORWARD (pos);
}
} }
} }
else else
{ {
p = BYTE_POS_ADDR (pos_byte);
endp = CHAR_POS_ADDR (XINT (lim));
stop = pos >= GPT && GPT > XINT (lim) ? GAP_END_ADDR : endp;
if (multibyte) if (multibyte)
{ {
while (1) while (1)
@ -2269,6 +2257,7 @@ skip_syntaxes (bool forwardp, Lisp_Object string, Lisp_Object lim)
} }
} }
done:
SET_PT_BOTH (pos, pos_byte); SET_PT_BOTH (pos, pos_byte);
immediate_quit = 0; immediate_quit = 0;