commit 335b4abb4f403b5d9559c232d58de65b3826e781
author ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Feb 07 18:58:04 2007 +0000
committer ap <ap@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Feb 07 18:58:04 2007 +0000
tree cd8bbf1c699350010f91f9eabb011890e4a0c11d
parent a6b57ec5787e2454dd2444d0f5a9674f1b819805

        Reviewed by Darin.

        http://bugs.webkit.org/show_bug.cgi?id=12603
        A crash when trying to use XPath functions normalize-space(), string-length() and number()

        Test: fast/xpath/implicit-node-args.html

        * xml/XPathFunctions.cpp:
        (WebCore::XPath::FunNumber::doEvaluate): Implemented zero parameter case.
        (WebCore::XPath::FunctionMapping::): Corrected descriptions of these functions, as they
        do allow zero parameters.
        (WebCore::XPath::createFunction): Combined the two failure cases to ensure that this
        function never returns 0.



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@19467 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/xml/XPathFunctions.cpp

diff --git a/WebCore/xml/XPathFunctions.cpp b/WebCore/xml/XPathFunctions.cpp
index 50d32d1..278fb2d 100644
--- a/WebCore/xml/XPathFunctions.cpp
+++ b/WebCore/xml/XPathFunctions.cpp
@@ -439,7 +439,7 @@
 
 Value FunString::doEvaluate() const
 {
-    if (argCount() == 0)
+    if (!argCount())
         return Value(Expression::evaluationContext().node.get()).toString();
     return arg(0)->evaluate().toString();
 }
@@ -531,14 +531,14 @@
 
 Value FunStringLength::doEvaluate() const
 {
-    if (argCount() == 0)
+    if (!argCount())
         return Value(Expression::evaluationContext().node.get()).toString().length();
     return arg(0)->evaluate().toString().length();
 }
 
 Value FunNormalizeSpace::doEvaluate() const
 {
-    if (argCount() == 0) {
+    if (!argCount()) {
         String s = Value(Expression::evaluationContext().node.get()).toString();
         return Value(s.simplifyWhiteSpace());
     }
@@ -635,6 +635,8 @@
 
 Value FunNumber::doEvaluate() const
 {
+    if (!argCount())
+        return Value(Expression::evaluationContext().node.get()).toNumber();
     return arg(0)->evaluate().toNumber();
 }
 
@@ -688,14 +690,14 @@
         { "local-name", { &createFunLocalName, Interval(0, 1) } },
         { "name", { &createFunName, Interval(0, 1) } },
         { "namespace-uri", { &createFunNamespaceURI, Interval(0, 1) } },
-        { "normalize-space", { &createFunNormalizeSpace, 1 } },
+        { "normalize-space", { &createFunNormalizeSpace, Interval(0, 1) } },
         { "not", { &createFunNot, 1 } },
-        { "number", { &createFunNumber, 1 } },
+        { "number", { &createFunNumber, Interval(0, 1) } },
         { "position", { &createFunPosition, 0 } },
         { "round", { &createFunRound, 1 } },
         { "starts-with", { &createFunStartsWith, 2 } },
         { "string", { &createFunString, Interval(0, 1) } },
-        { "string-length", { &createFunStringLength, 1 } },
+        { "string-length", { &createFunStringLength, Interval(0, 1) } },
         { "substring", { &createFunSubstring, Interval(2, 3) } },
         { "substring-after", { &createFunSubstringAfter, 2 } },
         { "substring-before", { &createFunSubstringBefore, 2 } },
@@ -715,7 +717,10 @@
     if (!functionMap)
         createFunctionMap();
 
-    if (!functionMap->contains(name)) {
+    HashMap<String, FunctionRec>::iterator functionMapIter = functionMap->find(name);
+    FunctionRec* functionRec = 0;
+
+    if (functionMapIter == functionMap->end() || !(functionRec = &functionMapIter->second)->args.contains(args.size())) {
         deleteAllValues(args);
 
         // Return a dummy function instead of 0.
@@ -724,13 +729,7 @@
         return funcTrue;
     }
 
-    FunctionRec functionRec = functionMap->get(name);
-    if (!functionRec.args.contains(args.size())) {
-        deleteAllValues(args);
-        return 0;
-    }
-
-    Function* function = functionRec.factoryFn();
+    Function* function = functionRec->factoryFn();
     function->setArguments(args);
     function->setName(name);
     return function;