- MFH: #8315, float is affected too

diff --git a/ext/filter/logical_filters.c b/ext/filter/logical_filters.c
index c299d13e59bb6757c6e50c755561f2041746d7c0..14933c9db4b6b2a1965105d27ace23a5014b4996 100644 (file)
--- a/ext/filter/logical_filters.c
+++ b/ext/filter/logical_filters.c
@@ -330,6 +330,7 @@ void php_filter_float(PHP_INPUT_FILTER_PARAM_DECL) /* {{{ */
                }
                i++;
                str[i] = '\0';
+               end = str + i - 1;
        }
 
        if (*str == '-') {
@@ -423,6 +424,9 @@ stateExp:
        }
 
 stateT:
+       if ((str -1) != end) {
+               goto stateError;
+       }
        if (exp_value) {
                exp_value *= exp_multiply;
                ret_val *= pow(10, exp_value);

diff --git a/ext/filter/tests/bug8315.phpt b/ext/filter/tests/bug8315.phpt
index 5e65590ecd514daef802d3985468fcf3c48f3cef..e5c6bc1c37cb9651ee8a4c1755867685d4d6400b 100644 (file)
--- a/ext/filter/tests/bug8315.phpt
+++ b/ext/filter/tests/bug8315.phpt
@@ -5,6 +5,9 @@ bug 8315, NULL values halt the validation
 
 $var="3".chr(0)."foo";
 var_dump(filter_data($var, FILTER_VALIDATE_INT));
+$var="3".chr(0)."foo";
+var_dump(filter_data($var, FILTER_VALIDATE_FLOAT));
 ?>
 --EXPECTF--    
 bool(false)
+bool(false)