clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #53037 (FILTER_FLAG_EMPTY_STRING_NULL is not implemented).

Browse Source
This commit is contained in:
Ilia Alshanetsky 2011-04-03 16:30:31 +00:00
parent 5a8c917c37
commit 063aba2e65
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ext/filter/sanitizing_filters.c
View File

@ -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);
}
}
/* }}} */

14
ext/filter/tests/bug53037.phpt Normal file
View File

@ -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