archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed possible incorrect "mark" usage

Browse source
This commit is contained in:
Dmitry Stogov 2018-01-09 10:30:00 +03:00
parent fc6a990891
commit cfee682802
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/pcre/php_pcre.c
View file

@ -1684,6 +1684,11 @@ static zend_string *php_pcre_replace_func_impl(pcre_cache_entry *pce, zend_strin
advance to the next character. */ advance to the next character. */
g_notempty = (start_offset == offsets[0]) ? PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED : 0; g_notempty = (start_offset == offsets[0]) ? PCRE_NOTEMPTY_ATSTART | PCRE_ANCHORED : 0;
#ifdef PCRE_EXTRA_MARK
/* replace function may use the same regex recursively */
extra->mark = &mark;
extra->flags |= PCRE_EXTRA_MARK;
#endif
} else if (count == PCRE_ERROR_NOMATCH || limit == 0) { } else if (count == PCRE_ERROR_NOMATCH || limit == 0) {
/* If we previously set PCRE_NOTEMPTY_ATSTART after a null match, /* If we previously set PCRE_NOTEMPTY_ATSTART after a null match,
this is not necessarily the end. We need to advance this is not necessarily the end. We need to advance