Changeset 175933 in webkit

Timestamp:

Nov 11, 2014, 8:34:18 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r175382 - ASSERT(!m_deletionHasBegun) in RefCounted.h should be ASSERT_WITH_SECURITY_IMPLICATION
​https://bugs.webkit.org/show_bug.cgi?id=138141

Reviewed by Alexey Proskuryakov.

• wtf/RefCounted.h:

(WTF::RefCountedBase::ref):
(WTF::RefCountedBase::relaxAdoptionRequirement):
(WTF::RefCountedBase::derefBase):
(WTF::adopted):

Location:

releases/WebKitGTK/webkit-2.6/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/RefCounted.h (modified) (5 diffs)

releases/WebKitGTK/webkit-2.6/Source/WTF/ChangeLog

@@ +1 @@
+2014-10-30  Jeffrey Pfau  <jpfau@apple.com>
+
+        ASSERT(!m_deletionHasBegun) in RefCounted.h should be ASSERT_WITH_SECURITY_IMPLICATION
+        https://bugs.webkit.org/show_bug.cgi?id=138141
+
+        Reviewed by Alexey Proskuryakov.
+
+        * wtf/RefCounted.h:
+        (WTF::RefCountedBase::ref):
+        (WTF::RefCountedBase::relaxAdoptionRequirement):
+        (WTF::RefCountedBase::derefBase):
+        (WTF::adopted):
+
 2014-10-27  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.6/Source/WTF/wtf/RefCounted.h

@@ -28 +28 @@
 namespace WTF {
 
-#ifdef NDEBUG
+#if defined(NDEBUG) && !defined(ADDRESS_SANITIZER)
 #define CHECK_REF_COUNTED_LIFECYCLE 0
 #else
@@ -42 +42 @@
     {
 #if CHECK_REF_COUNTED_LIFECYCLE
-        ASSERT(!m_deletionHasBegun);
+        ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
         ASSERT(!m_adoptionIsRequired);
 #endif
@@ -64 +64 @@
     {
 #if CHECK_REF_COUNTED_LIFECYCLE
-        ASSERT(!m_deletionHasBegun);
+        ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
         ASSERT(m_adoptionIsRequired);
         m_adoptionIsRequired = false;
@@ -92 +92 @@
     {
 #if CHECK_REF_COUNTED_LIFECYCLE
-        ASSERT(!m_deletionHasBegun);
+        ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
         ASSERT(!m_adoptionIsRequired);
 #endif
@@ -133 +133 @@
     if (!object)
         return;
-    ASSERT(!object->m_deletionHasBegun);
+    ASSERT_WITH_SECURITY_IMPLICATION(!object->m_deletionHasBegun);
     object->m_adoptionIsRequired = false;
 }