diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-07-20 15:27:16 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-07-20 15:27:16 +0000 |
| commit | 9de5b9e04a30d0f75d627de07e217500ede5395d (patch) | |
| tree | 91c385bdc54157d73a9ae8c4aa105b4b5bf4a3f8 /ext/pcre | |
| parent | 8a6f3f80f2209618e08fe879880250e0128b3c6b (diff) | |
| download | php-git-9de5b9e04a30d0f75d627de07e217500ede5395d.tar.gz | |
# There you go, Wico.
Fix bug $5676.
@- Fixed preg_replace() to automatically escape quotes in matched
@ strings when using /e modifier. (Andrei)
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/php_pcre.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 55555c1d08..4641067904 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -536,10 +536,12 @@ static int preg_do_eval(char *eval_str, int eval_str_len, char *subject, *code, /* PHP code string */ *new_code, /* Code as result of substitution */ *match, /* Current match for a backref */ + *esc_match, /* Quote-escaped match */ *walk; /* Used to walk the code string */ int code_len; /* Length of the code string */ int new_code_len; /* Length of the substituted code string */ int match_len; /* Length of the match */ + int esc_match_len; /* Length of the quote-escaped match */ int result_len; /* Length of the result of the evaluation */ int backref; /* Current backref */ CLS_FETCH(); @@ -557,15 +559,17 @@ 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]; + esc_match = php_addslashes(match, match_len, &esc_match_len, 0); sprintf(backref_buf, "\\%d", backref); new_code = php_str_to_str(code, code_len, backref_buf, (backref > 9) ? 3 : 2, - match, match_len, &new_code_len); + esc_match, esc_match_len, &new_code_len); /* Adjust the walk pointer */ walk = new_code + (walk - code) + match_len; /* Clean up and reassign */ + efree(esc_match); efree(code); code = new_code; code_len = new_code_len; |