diff options
| author | Martin Jansen <martin@divbyzero.net> | 2012-12-24 14:58:01 +0100 |
|---|---|---|
| committer | Lars Strojny <lstrojny@php.net> | 2012-12-29 03:31:13 +0100 |
| commit | 3990641e62b5648965883604e286b64e098b351e (patch) | |
| tree | efe67927e668087c09ec5842852ba404eee11b11 | |
| parent | ac3d227e28056bf5294a8a64e2f41ce2beebaa05 (diff) | |
| download | php-git-3990641e62b5648965883604e286b64e098b351e.tar.gz | |
Treat "+0" and "-0" as valid integers just like var_dump() does.
This fixes bug #54096.
| -rw-r--r-- | ext/filter/logical_filters.c | 5 | ||||
| -rw-r--r-- | ext/filter/tests/filter_data.phpt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c index 4de6b83e00..c03c698700 100644 --- a/ext/filter/logical_filters.c +++ b/ext/filter/logical_filters.c @@ -80,6 +80,11 @@ static int php_filter_parse_int(const char *str, unsigned int str_len, long *ret break; } + if (*str == '0' && str + 1 == end) { + /* Special cases: +0 and -0 */ + return 1; + } + /* must start with 1..9*/ if (str < end && *str >= '1' && *str <= '9') { ctx_value = ((sign)?-1:1) * ((*(str++)) - '0'); diff --git a/ext/filter/tests/filter_data.phpt b/ext/filter/tests/filter_data.phpt index 1071b3efae..5e3b82a1fb 100644 --- a/ext/filter/tests/filter_data.phpt +++ b/ext/filter/tests/filter_data.phpt @@ -10,6 +10,8 @@ precision=14 /* Integer */ $data = "-123"; var_dump(filter_var($data, FILTER_VALIDATE_INT)); $data = "0"; var_dump(filter_var($data, FILTER_VALIDATE_INT)); +$data = "-0"; var_dump(filter_var($data, FILTER_VALIDATE_INT)); +$data = "+0"; var_dump(filter_var($data, FILTER_VALIDATE_INT)); $data = "123"; var_dump(filter_var($data, FILTER_VALIDATE_INT)); $data = -123; var_dump(filter_var($data, FILTER_VALIDATE_INT)); $data = 0; var_dump(filter_var($data, FILTER_VALIDATE_INT)); @@ -46,6 +48,8 @@ $data = ""; var_dump(filter_var($data, FILTER_VALIDATE_BOOLEAN)); --EXPECT-- int(-123) int(0) +int(0) +int(0) int(123) int(-123) int(0) |