Changeset 107208 in webkit

Timestamp:

Feb 9, 2012 3:21:46 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

ASSERT_NO_EXCEPTION should be initialized with non-zero value.
​https://bugs.webkit.org/show_bug.cgi?id=78194

Patch by Shinya Kawanaka <​shinyak@google.com> on 2012-02-09
Reviewed by Hajime Morita.

ExceptionCode should not be checked without initializing it.
However, we encountered a bug that breaks this rule.
It was missed until now because ExceptionCode is sometimes set to 0 even if it is not initialized.
This patch ensures it is initialized as non-zero value.

No new tests, no change in behavior.

• dom/ExceptionCodePlaceholder.cpp:

(WebCore::NoExceptionAssertionChecker::NoExceptionAssertionChecker):
(WebCore::NoExceptionAssertionChecker::~NoExceptionAssertionChecker):

• dom/ExceptionCodePlaceholder.h:

(NoExceptionAssertionChecker):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ExceptionCodePlaceholder.cpp (modified) (2 diffs)
• dom/ExceptionCodePlaceholder.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-09  Shinya Kawanaka  <shinyak@google.com>
+
+        ASSERT_NO_EXCEPTION should be initialized with non-zero value.
+        https://bugs.webkit.org/show_bug.cgi?id=78194
+
+        Reviewed by Hajime Morita.
+
+        ExceptionCode should not be checked without initializing it.
+        However, we encountered a bug that breaks this rule.
+        It was missed until now because ExceptionCode is sometimes set to 0 even if it is not initialized.
+        This patch ensures it is initialized as non-zero value.
+
+        No new tests, no change in behavior.
+
+        * dom/ExceptionCodePlaceholder.cpp:
+        (WebCore::NoExceptionAssertionChecker::NoExceptionAssertionChecker):
+        (WebCore::NoExceptionAssertionChecker::~NoExceptionAssertionChecker):
+        * dom/ExceptionCodePlaceholder.h:
+        (NoExceptionAssertionChecker):
+
 2012-02-09  Roland Steiner  <rolandsteiner@chromium.org>
 

trunk/Source/WebCore/dom/ExceptionCodePlaceholder.cpp

@@ -37 +37 @@
 
 NoExceptionAssertionChecker::NoExceptionAssertionChecker(const char* file, int line)
-    : ExceptionCodePlaceholder(0)
+    : ExceptionCodePlaceholder(defaultExceptionCode)
     , m_file(file)
     , m_line(line)
@@ -45 +45 @@
 NoExceptionAssertionChecker::~NoExceptionAssertionChecker()
 {
-    ASSERT_AT(!m_code, m_file, m_line, "");
+    ASSERT_AT(!m_code || m_code == defaultExceptionCode, m_file, m_line, "");
 }
 

trunk/Source/WebCore/dom/ExceptionCodePlaceholder.h

@@ -71 +71 @@
 
 private:
+    static const ExceptionCode defaultExceptionCode = 0xaaaaaaaa;
     const char* m_file;
     int m_line;