Fixed bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented).

Ilia Alshanetsky · Ilia Alshanetsky · commit 063aba2e6551 · 2011-04-03T16:30:31.000Z
diff --git a/ext/filter/sanitizing_filters.c b/ext/filter/sanitizing_filters.c
@@ -205,7 +205,11 @@ void php_filter_string(PHP_INPUT_FILTER_PARAM_DECL)
 
 	if (new_len == 0) {
 		zval_dtor(value);
-		ZVAL_EMPTY_STRING(value);
+		if (flags & FILTER_FLAG_EMPTY_STRING_NULL) {
+			ZVAL_NULL(value);
+		} else {
+			ZVAL_EMPTY_STRING(value);			
+		}
 		return;
 	}
 }
@@ -280,6 +284,9 @@ void php_filter_unsafe_raw(PHP_INPUT_FILTER_PARAM_DECL)
 		}
 
 		php_filter_encode_html(value, enc);	
+	} else if (flags & FILTER_FLAG_EMPTY_STRING_NULL && Z_STRLEN_P(value) == 0) {
+		zval_dtor(value);
+		ZVAL_NULL(value);
 	}
 }
 /* }}} */
diff --git a/ext/filter/tests/bug53037.phpt b/ext/filter/tests/bug53037.phpt
@@ -0,0 +1,14 @@
+--TEST--
+Bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented)
+--SKIPIF--
+<?php if (!extension_loaded("filter")) die("skip"); ?>
+--FILE--
+<?php
+var_dump(
+	filter_var("", FILTER_DEFAULT),
+    filter_var("", FILTER_DEFAULT, array('flags' => FILTER_FLAG_EMPTY_STRING_NULL))
+);
+?>
+--EXPECT--	
+string(0) ""
+NULL

Original file line number	Diff line number	Diff line change
`@@ -205,7 +205,11 @@ void php_filter_string(PHP_INPUT_FILTER_PARAM_DECL)`
`205`	`205`
`206`	`206`	`if (new_len == 0) {`
`207`	`207`	`zval_dtor(value);`
`208`		`- ZVAL_EMPTY_STRING(value);`
	`208`	`+ if (flags & FILTER_FLAG_EMPTY_STRING_NULL) {`
	`209`	`+ ZVAL_NULL(value);`
	`210`	`+ } else {`
	`211`	`+ ZVAL_EMPTY_STRING(value);`
	`212`	`+ }`
`209`	`213`	`return;`
`210`	`214`	`}`
`211`	`215`	`}`
`@@ -280,6 +284,9 @@ void php_filter_unsafe_raw(PHP_INPUT_FILTER_PARAM_DECL)`
`280`	`284`	`}`
`281`	`285`
`282`	`286`	`php_filter_encode_html(value, enc);`
	`287`	`+ } else if (flags & FILTER_FLAG_EMPTY_STRING_NULL && Z_STRLEN_P(value) == 0) {`
	`288`	`+ zval_dtor(value);`
	`289`	`+ ZVAL_NULL(value);`
`283`	`290`	`}`
`284`	`291`	`}`
`285`	`292`	`/* }}} */`