Changeset 30647 in webkit

Timestamp:

Feb 28, 2008, 10:19:59 AM (17 years ago)

Author:

mitz@apple.com

Message:

Reviewed by Darin Adler.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17590 ASSERTION FAILED: subject in jsRegExpExecute()

• page/mac/FrameMac.mm: (WebCore::Frame::matchLabelsAgainstElement): Added an early return in case the element name is empty.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/mac/FrameMac.mm (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-28  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Darin Adler.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17590
+          ASSERTION FAILED: subject in jsRegExpExecute()
+
+        * page/mac/FrameMac.mm:
+        (WebCore::Frame::matchLabelsAgainstElement): Added an early return in
+        case the element name is empty.
+
 2008-02-28  Justin Garcia  <justin.garcia@apple.com>
 

trunk/WebCore/page/mac/FrameMac.mm

@@ -297 +297 @@
 {
     String name = element->getAttribute(nameAttr);
+    if (name.isEmpty())
+        return nil;
+
     // Make numbers and _'s in field names behave like word boundaries, e.g., "address2"
     replace(name, RegularExpression("\\d"), " ");
     name.replace('_', ' ');
-    
+
     RegularExpression* regExp = regExpForLabels(labels);
     // Use the largest match we can find in the whole name string
@@ -316 +319 @@
                 bestLength = length;
             }
-            start = pos+1;
+            start = pos + 1;
         }
     } while (pos != -1);