Skip to content

Commit 5e4c6de

Browse files
committed
Merge branch 'PHP-7.3'
2 parents f80b1b0 + 3c98c2d commit 5e4c6de

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

ext/mbstring/php_mbregex.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,8 +713,7 @@ static inline void mb_regex_substitute(
713713
sp = p; /* save position */
714714
clen = (int) php_mb_mbchar_bytes_ex(++p, enc);
715715
if (clen != 1 || p == eos) {
716-
/* skip escaped multibyte char */
717-
p += clen;
716+
/* skip backslash followed by multibyte char */
718717
smart_str_appendl(pbuf, sp, p - sp);
719718
continue;
720719
}

ext/mbstring/tests/bug77514.phpt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--TEST--
2+
Bug #77514: mb_ereg_replace() with trailing backslash adds null byte
3+
--FILE--
4+
<?php
5+
6+
$a="abc123";
7+
var_dump(mb_ereg_replace("123","def\\",$a));
8+
9+
?>
10+
--EXPECT--
11+
string(7) "abcdef\"

0 commit comments

Comments
 (0)