Changeset 35601

Timestamp:

08/06/08 05:46:40 (4 months ago)

Author:

jmalonzo@webkit.org

Message:

2008-08-06 Marco Barisione <marco.barisione@collabora.co.uk>

Reviewed by Eric Seidel.

http://bugs.webkit.org/show_bug.cgi?id=20295
RegularExpression::match should not crash when a null string is passed

RegularExpression::match used to pass null subject strings to
jsRegExpExecute causing an ASSERT failure and then a crash.
There is no need to fix also RegularExpression:search and
RegularExpression::searchRev as they just call
RegularExpression::match.

• platform/text/RegularExpression.cpp: (WebCore::RegularExpression::match): Return -1 if the string is null.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/text/RegularExpression.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-08-06  Marco Barisione  <marco.barisione@collabora.co.uk>
+
+        Reviewed by Eric Seidel.
+
+        http://bugs.webkit.org/show_bug.cgi?id=20295
+        RegularExpression::match should not crash when a null string is passed
+
+        RegularExpression::match used to pass null subject strings to
+        jsRegExpExecute causing an ASSERT failure and then a crash.
+        There is no need to fix also RegularExpression:search and
+        RegularExpression::searchRev as they just call
+        RegularExpression::match.
+
+        * platform/text/RegularExpression.cpp:
+        (WebCore::RegularExpression::match): Return -1 if the string is null.
+
 2008-08-06  Jan Michael Alonzo  <jmalonzo@webkit.org>
 

trunk/WebCore/platform/text/RegularExpression.cpp

@@ -1 +1 @@
 /*
  * Copyright (C) 2004, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2008 Collabora Ltd.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -130 +131 @@
 int RegularExpression::match(const String& str, int startFrom, int* matchLength) const
 {
+    if (str.isNull())
+        return -1;
+
     d->lastMatchString = str;
     // First 2 offsets are start and end offsets; 3rd entry is used internally by pcre