mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-20 18:53:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Repatch fixes for the problem that was reported at php-dev@php.gr.jp (#884)

Browse Source
This commit is contained in:
Moriyoshi Koizumi 2003-09-26 17:43:39 +00:00
parent 7e4a886971
commit 83609e0874
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/mbstring/php_mbregex.c
View File

@ -516,6 +516,7 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, int op
smart_str *pbuf;
int i, err, eval, n;
UChar *pos;
UChar *string_lim;
char *description = NULL;
char pat_buf[2];
@ -579,9 +580,10 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, int op
/* do the actual work */
err = 0;
pos = string;
string_lim = (UChar*)(string + string_len);
regs = php_mb_regex_region_new();
while (err >= 0) {
err = php_mb_regex_search(re, (UChar *)string, (UChar *)(string + string_len), pos, (UChar *)(string + string_len), regs, 0);
err = php_mb_regex_search(re, (UChar *)string, (UChar *)string_lim, pos, (UChar *)string_lim, regs, 0);
if (err <= -2) {
UChar err_str[REG_MAX_ERROR_MESSAGE_LEN];
php_mb_regex_error_code_to_str(err_str, err);
@ -636,16 +638,15 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, int op
if ((size_t)(pos - (UChar *)string) < n) {
pos = string + n;
} else {
smart_str_appendl(&out_buf, pos, 1);
if (pos < string_lim) {
smart_str_appendl(&out_buf, pos, 1);
}
pos++;
}
} else { /* nomatch */
/* stick that last bit of string on our output */
int l = (UChar *)(string + string_len) - pos;
if (l > 0) {
smart_str_appendl(&out_buf, pos, l);
} else {
out_buf.len += l;
if (string_lim - pos > 0) {
smart_str_appendl(&out_buf, pos, string_lim - pos);
}
}
php_mb_regex_region_free(regs, 0);