Changeset 19697 in webkit

Timestamp:

Feb 18, 2007 1:07:30 PM (17 years ago)

Author:

ap

Message:

Reviewed by Adele.

​http://bugs.webkit.org/show_bug.cgi?id=12807
XPath incorrectly converts NaN to boolean

Test: fast/xpath/nan-to-boolean.html

• xml/XPathValue.cpp: (WebCore::XPath::Value::toBoolean): Convert NaN to false.
• xml/XPathFunctions.cpp: (WebCore::XPath::FunSubstringAfter::doEvaluate): Fix substring-after to actually work.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/xpath/nan-to-boolean-expected.txt (added)
• LayoutTests/fast/xpath/nan-to-boolean.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/xml/XPathFunctions.cpp (modified) (1 diff)
• WebCore/xml/XPathValue.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2007-02-18  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Adele.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12807
+        XPath incorrectly converts NaN to boolean
+
+        * fast/xpath/nan-to-boolean-expected.txt: Added.
+        * fast/xpath/nan-to-boolean.html: Added.
+
 2007-02-18  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-02-18  Alexey Proskuryakov  <ap@webkit.org>
+
+        Reviewed by Adele.
+
+        http://bugs.webkit.org/show_bug.cgi?id=12807
+        XPath incorrectly converts NaN to boolean
+
+        Test: fast/xpath/nan-to-boolean.html
+
+        * xml/XPathValue.cpp:
+        (WebCore::XPath::Value::toBoolean): Convert NaN to false.
+        * xml/XPathFunctions.cpp:
+        (WebCore::XPath::FunSubstringAfter::doEvaluate): Fix substring-after to actually work.
+
 2007-02-18  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/xml/XPathFunctions.cpp

@@ -505 +505 @@
         return "";
 
-    return s1.substring(i + 1);
+    return s1.substring(s2.length());
 }
 

trunk/WebCore/xml/XPathValue.cpp

@@ -96 +96 @@
             return m_bool;
         case NumberValue:
-            return m_number != 0;
+            return m_number != 0 && !isnan(m_number);
         case StringValue:
             return !m_string.isEmpty();