summaryrefslogtreecommitdiff
path: root/ext/pcre/php_pcre.c
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2005-05-31 12:54:56 +0000
committerfoobar <sniper@php.net>2005-05-31 12:54:56 +0000
commit156a9089977828e75b9dc7b06658079a0ff20695 (patch)
tree7cfa68f093eefdeca563d05953208531ef2cf045 /ext/pcre/php_pcre.c
parent747074f9888b5062feb3e0fa427d98fb67e657ce (diff)
downloadphp-git-156a9089977828e75b9dc7b06658079a0ff20695.tar.gz
- Fixed bug #33200 (preg_replace(): magic_quotes_sybase=On makes 'e' modifier misbehave)
Diffstat (limited to 'ext/pcre/php_pcre.c')
-rw-r--r--ext/pcre/php_pcre.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index 5e404b0ddf..cf518b4506 100644
--- a/ext/pcre/php_pcre.c
+++ b/ext/pcre/php_pcre.c
@@ -761,9 +761,9 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject,
in instead of the backref */
match = subject + offsets[backref<<1];
match_len = offsets[(backref<<1)+1] - offsets[backref<<1];
- if (match_len)
- esc_match = php_addslashes(match, match_len, &esc_match_len, 0 TSRMLS_CC);
- else {
+ if (match_len) {
+ esc_match = php_addslashes_ex(match, match_len, &esc_match_len, 0, 1 TSRMLS_CC);
+ } else {
esc_match = match;
esc_match_len = 0;
}