MFH: fix #39763 (magic quotes are applied twice by ext/filter)

diff --git a/NEWS b/NEWS
index 6afddf16bcdf55193cc01b94f57e7f549da51bf9..bcc23235d3bb17562c18ef08842559588ddd9d3c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -49,6 +49,7 @@ PHP                                                                        NEWS
 - Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry)
 - Fixed wrong signature initialization in imagepng (Takeshi Abe)
 - Added optimization for imageline with horizontal and vertial lines (Pierre)
+- Fixed bug #39763 (magic quotes are applied twice by ext/filter). (Tony)
 - Fixed bug #39754 (Some POSIX extension functions not thread safe).
   (Ilia, wharmby at uk dot ibm dot com)
 - Fixed bug #39724 (Broken build due to spl/filter usage of pcre extension).

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 1b87db2e2dcb100c9f3179022baffba2dcf63981..3e3082436e4f737841483381ad427233e138920e 100644 (file)
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -397,8 +397,6 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
                        Z_STRVAL(new_var) = estrndup(*val, val_len);
                        INIT_PZVAL(tmp_new_var);
                        php_zval_filter(&tmp_new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/, 0 TSRMLS_CC);
-               } else if (PG(magic_quotes_gpc)) {
-                       Z_STRVAL(new_var) = php_addslashes(*val, Z_STRLEN(new_var), &Z_STRLEN(new_var), 0 TSRMLS_CC);
                } else {
                        Z_STRVAL(new_var) = estrndup(*val, val_len);
                }