Checking in for trev@gtchat.de. Fixing bug 238409. Regression in attribute parsing. r=bugmail@sicking.cc, sr=jst@mozilla.org, a=asa@mozilla.org

content/base/src/nsAttrValue.cpp

@@ -764,7 +764,8 @@ nsAttrValue::ParseSpecialIntValue(const nsAString& aString,
   nsAutoString tmp(aString);
   PRInt32 val = tmp.ToInteger(&ec);
 
-  if (NS_FAILED(ec) && aCanBeProportional) {
+  if (NS_FAILED(ec)) {
+    if (aCanBeProportional) {
       // Even if the integer could not be parsed, it might just be "*"
       tmp.CompressWhitespace(PR_TRUE, PR_TRUE);
       if (tmp.Length() == 1 && tmp.Last() == '*') {
@@ -775,6 +776,8 @@ nsAttrValue::ParseSpecialIntValue(const nsAString& aString,
         return PR_TRUE;
       }
     }
+    return PR_FALSE;
+  }
 
   val = PR_MAX(val, 0);
   val = PR_MIN(val, NS_ATTRVALUE_INTEGERTYPE_MAXVALUE);