1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/html/parser/HTMLParserIdioms.cpp b/WebCore/html/parser/HTMLParserIdioms.cpp
index a558cf5..f093eb2 100644
--- a/WebCore/html/parser/HTMLParserIdioms.cpp
+++ b/WebCore/html/parser/HTMLParserIdioms.cpp
@@ -43,7 +43,7 @@ String stripLeadingAndTrailingHTMLSpaces(const String& string)
     }
 
     if (numLeadingSpaces == length)
-        return emptyAtom;
+        return string.isNull() ? string : emptyAtom.string();
 
     unsigned numTrailingSpaces;
     for (numTrailingSpaces = 0; numTrailingSpaces < length; ++numTrailingSpaces) {
@@ -53,7 +53,7 @@ String stripLeadingAndTrailingHTMLSpaces(const String& string)
 
     ASSERT(numLeadingSpaces + numTrailingSpaces < length);
 
-    return string.substring(numLeadingSpaces, length - numTrailingSpaces);
+    return string.substring(numLeadingSpaces, length - (numLeadingSpaces + numTrailingSpaces));
 }
 
 String serializeForNumberType(double number)