mirror of
https://github.com/php/php-src.git
synced 2025-08-16 05:58:45 +02:00
fixed win32-build and update e-mail address in mbstring.
This commit is contained in:
parent
c8db2e0455
commit
25bb0d16a9
11 changed files with 149 additions and 21 deletions
|
@ -653,7 +653,8 @@ static void _php_mb_regex_ereg_replace_exec(INTERNAL_FUNCTION_PARAMETERS, int op
|
|||
}
|
||||
} else { /* nomatch */
|
||||
/* stick that last bit of string on our output */
|
||||
smart_str_appendl(&out_buf, pos, (size_t)((UChar *)(string + string_len) - pos));
|
||||
if ((UChar *)(string + string_len) > pos)
|
||||
smart_str_appendl(&out_buf, pos, (size_t)((UChar *)(string + string_len) - pos));
|
||||
}
|
||||
php_mb_regex_region_free(regs, 0);
|
||||
}
|
||||
|
@ -1124,3 +1125,11 @@ PHP_FUNCTION(mb_regex_set_options)
|
|||
|
||||
#endif /* HAVE_MBREGEX */
|
||||
|
||||
/*
|
||||
* Local variables:
|
||||
* tab-width: 4
|
||||
* c-basic-offset: 4
|
||||
* End:
|
||||
* vim600: fdm=marker
|
||||
* vim: noet sw=4 ts=4
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue