masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-06 20:29:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inhibit buffer relocation during regex searches

Browse source 
* src/search.c (looking_at_1, fast_looking_at, search_buffer): Prevent
relocation of buffer contents during calls to re_search_2.  This ensures
the pointers into buffer text won't be invalidated by
r_alloc_sbrk (called from malloc with configurations where
REL_ALLOC=yes).
This commit is contained in:
Noam Postavsky 2016-10-24 21:22:07 -04:00
parent fee4cef7d7
commit 43986d16fb
1 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/search.c
View file

@ -308,12 +308,20 @@ looking_at_1 (Lisp_Object string, bool posix)
re_match_object = Qnil; re_match_object = Qnil;
#ifdef REL_ALLOC
/* Prevent ralloc.c from relocating the current buffer while
searching it. */
r_alloc_inhibit_buffer_relocation (1);
#endif
i = re_match_2 (bufp, (char *) p1, s1, (char *) p2, s2, i = re_match_2 (bufp, (char *) p1, s1, (char *) p2, s2,
PT_BYTE - BEGV_BYTE, PT_BYTE - BEGV_BYTE,
(NILP (Vinhibit_changing_match_data) (NILP (Vinhibit_changing_match_data)
? &search_regs : NULL), ? &search_regs : NULL),
ZV_BYTE - BEGV_BYTE); ZV_BYTE - BEGV_BYTE);
immediate_quit = 0; immediate_quit = 0;
#ifdef REL_ALLOC
r_alloc_inhibit_buffer_relocation (0);
#endif
if (i == -2) if (i == -2)
matcher_overflow (); matcher_overflow ();
@ -561,8 +569,16 @@ fast_looking_at (Lisp_Object regexp, ptrdiff_t pos, ptrdiff_t pos_byte,
buf = compile_pattern (regexp, 0, Qnil, 0, multibyte); buf = compile_pattern (regexp, 0, Qnil, 0, multibyte);
immediate_quit = 1; immediate_quit = 1;
#ifdef REL_ALLOC
/* Prevent ralloc.c from relocating the current buffer while
searching it. */
r_alloc_inhibit_buffer_relocation (1);
#endif
len = re_match_2 (buf, (char *) p1, s1, (char *) p2, s2, len = re_match_2 (buf, (char *) p1, s1, (char *) p2, s2,
pos_byte, NULL, limit_byte); pos_byte, NULL, limit_byte);
#ifdef REL_ALLOC
r_alloc_inhibit_buffer_relocation (0);
#endif
immediate_quit = 0; immediate_quit = 0;
return len; return len;
@ -1213,6 +1229,12 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
} }
re_match_object = Qnil; re_match_object = Qnil;
#ifdef REL_ALLOC
/* Prevent ralloc.c from relocating the current buffer while
searching it. */
r_alloc_inhibit_buffer_relocation (1);
#endif
while (n < 0) while (n < 0)
{ {
ptrdiff_t val; ptrdiff_t val;
@ -1254,6 +1276,9 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
else else
{ {
immediate_quit = 0; immediate_quit = 0;
#ifdef REL_ALLOC
r_alloc_inhibit_buffer_relocation (0);
#endif
return (n); return (n);
} }
n++; n++;
@ -1296,11 +1321,17 @@ search_buffer (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte,
else else
{ {
immediate_quit = 0; immediate_quit = 0;
#ifdef REL_ALLOC
r_alloc_inhibit_buffer_relocation (0);
#endif
return (0 - n); return (0 - n);
} }
n--; n--;
} }
immediate_quit = 0; immediate_quit = 0;
#ifdef REL_ALLOC
r_alloc_inhibit_buffer_relocation (0);
#endif
return (pos); return (pos);
} }
else /* non-RE case */ else /* non-RE case */