pajoye          Sat Jul 29 12:46:16 2006 UTC

  Modified files:              
    /php-src/ext/filter logical_filters.c 
    /php-src/ext/filter/tests   bug8315.phpt 
  Log:
  - MFH: #8315, float is affected too
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/logical_filters.c?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/filter/logical_filters.c
diff -u php-src/ext/filter/logical_filters.c:1.5 
php-src/ext/filter/logical_filters.c:1.6
--- php-src/ext/filter/logical_filters.c:1.5    Sat Jul 29 01:27:47 2006
+++ php-src/ext/filter/logical_filters.c        Sat Jul 29 12:46:16 2006
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: logical_filters.c,v 1.5 2006/07/29 01:27:47 pajoye Exp $ */
+/* $Id: logical_filters.c,v 1.6 2006/07/29 12:46:16 pajoye Exp $ */
 
 #include "php_filter.h"
 #include "filter_private.h"
@@ -330,6 +330,7 @@
                }
                i++;
                str[i] = '\0';
+               end = str + i - 1;
        }
 
        if (*str == '-') {
@@ -423,6 +424,9 @@
        }
 
 stateT:
+       if ((str -1) != end) {
+               goto stateError;
+       }
        if (exp_value) {
                exp_value *= exp_multiply;
                ret_val *= pow(10, exp_value);
http://cvs.php.net/viewvc.cgi/php-src/ext/filter/tests/bug8315.phpt?r1=1.2&r2=1.3&diff_format=u
Index: php-src/ext/filter/tests/bug8315.phpt
diff -u php-src/ext/filter/tests/bug8315.phpt:1.2 
php-src/ext/filter/tests/bug8315.phpt:1.3
--- php-src/ext/filter/tests/bug8315.phpt:1.2   Sat Jul 29 01:27:47 2006
+++ php-src/ext/filter/tests/bug8315.phpt       Sat Jul 29 12:46:16 2006
@@ -5,6 +5,9 @@
 
 $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)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to