From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 27 Jul 2006 18:15:10 +0000 (+0000)
Subject: MFB: Fixed a bug in the filter extension that prevented magic_quotes_gpc
X-Git-Tag: RELEASE_1_0_0RC1~2190
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=dffc66671e5ca4de115f06a048551f981d5ddf03;p=php

MFB: Fixed a bug in the filter extension that prevented magic_quotes_gpc
from being applied when RAW filter is used.
---

diff --git a/ext/filter/filter.c b/ext/filter/filter.c
index 7dc95c7ddc..0ffe3f23a3 100644
--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@@ -368,17 +368,23 @@ static unsigned int php_sapi_filter(int arg, char *var, char **val, unsigned int
 		php_register_variable_ex(var, &raw_var, array_ptr TSRMLS_CC);
 	}
 
-	/* Register mangled variable */
-	/* FIXME: Should not use php_register_variable_ex as that also registers
-	 * globals when register_globals is turned on */
-	Z_STRLEN(new_var) = val_len;
-	Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
-	Z_TYPE(new_var) = IS_STRING;
-
 	if (val_len) {
-		if (! (IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
+		/* Register mangled variable */
+		/* FIXME: Should not use php_register_variable_ex as that also registers
+		 * globals when register_globals is turned on */
+		Z_STRLEN(new_var) = val_len;
+		Z_TYPE(new_var) = IS_STRING;
+
+		if (!(IF_G(default_filter) == FILTER_UNSAFE_RAW)) {
+			Z_STRVAL(new_var) = estrndup(*val, val_len + 1);
 			php_zval_filter(&new_var, IF_G(default_filter), IF_G(default_filter_flags), NULL, NULL/*charset*/ 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 + 1);
 		}
+	} else { /* empty string */
+		ZVAL_EMPTY_STRING(&new_var);
 	}
 
 	if (orig_array_ptr) {