From: Andrei Zmievski <andrei@php.net>
Date: Thu, 20 Jul 2000 15:27:16 +0000 (+0000)
Subject: # There you go, Wico.
X-Git-Tag: PRE_FILE_COMPILE_API_CHANGE~216
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9de5b9e04a30d0f75d627de07e217500ede5395d;p=php

# There you go, Wico.
Fix bug $5676.
@- Fixed preg_replace() to automatically escape quotes in matched
@  strings when using /e modifier. (Andrei)
---

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;