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

* src/regex.c (re_search_2): Make new code safe for -Wjump-misses-init.

Browse source
This commit is contained in:
Paul Eggert 2016-10-23 01:00:27 -07:00
parent f6134bbda2
commit c2a17924a5
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/regex.c
View file

@ -4380,6 +4380,10 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1, size_t size1,
/* Loop through the string, looking for a place to start matching. */ /* Loop through the string, looking for a place to start matching. */
for (;;) for (;;)
{ {
ptrdiff_t offset1, offset2;
re_char *orig_base;
bool might_relocate;
/* If the pattern is anchored, /* If the pattern is anchored,
skip quickly past places we cannot match. skip quickly past places we cannot match.
We don't bother to treat startpos == 0 specially We don't bother to treat startpos == 0 specially
@ -4498,10 +4502,9 @@ re_search_2 (struct re_pattern_buffer *bufp, const char *str1, size_t size1,
/* re_match_2_internal may allocate, relocating the Lisp text /* re_match_2_internal may allocate, relocating the Lisp text
object that we're searching. */ object that we're searching. */
ptrdiff_t offset1, offset2;
IF_LINT (offset2 = 0); /* Work around GCC bug 78081. */ IF_LINT (offset2 = 0); /* Work around GCC bug 78081. */
re_char *orig_base = STR_BASE_PTR (re_match_object); orig_base = STR_BASE_PTR (re_match_object);
bool might_relocate = orig_base != NULL; might_relocate = orig_base != NULL;
if (might_relocate) if (might_relocate)
{ {
if (string1) offset1 = string1 - orig_base; if (string1) offset1 = string1 - orig_base;