Title: [203031] trunk/Source/WebCore
Revision
203031
Author
[email protected]
Date
2016-07-09 08:47:29 -0700 (Sat, 09 Jul 2016)

Log Message

REGRESSION (r202931): breaks release builds with ASSERT_WITH_SECURITY_IMPLICATION for fuzzing
https://bugs.webkit.org/show_bug.cgi?id=159599
rdar://problem/27248835

Reviewed by Chris Dumez.

Make RenderStyle::deletionHasBegun() available with ENABLE(SECURITY_ASSERTIONS)

* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::~RenderStyle):
* rendering/style/RenderStyle.h:
(WebCore::RenderStyle::deletionHasBegun):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (203030 => 203031)


--- trunk/Source/WebCore/ChangeLog	2016-07-09 15:39:34 UTC (rev 203030)
+++ trunk/Source/WebCore/ChangeLog	2016-07-09 15:47:29 UTC (rev 203031)
@@ -1,3 +1,18 @@
+2016-07-09  Antti Koivisto  <[email protected]>
+
+        REGRESSION (r202931): breaks release builds with ASSERT_WITH_SECURITY_IMPLICATION for fuzzing
+        https://bugs.webkit.org/show_bug.cgi?id=159599
+        rdar://problem/27248835
+
+        Reviewed by Chris Dumez.
+
+        Make RenderStyle::deletionHasBegun() available with ENABLE(SECURITY_ASSERTIONS)
+
+        * rendering/style/RenderStyle.cpp:
+        (WebCore::RenderStyle::~RenderStyle):
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::deletionHasBegun):
+
 2016-07-09  Youenn Fablet  <[email protected]>
 
         Make use of PrivateIdentifier to simplify Fetch Headers built-in checks

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (203030 => 203031)


--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2016-07-09 15:39:34 UTC (rev 203030)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp	2016-07-09 15:47:29 UTC (rev 203031)
@@ -80,7 +80,7 @@
     struct NonInheritedFlags {
         uint64_t m_flags;
     } noninherited_flags;
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
     bool deletionCheck;
 #endif
 };
@@ -184,8 +184,8 @@
 
 RenderStyle::~RenderStyle()
 {
-#if !ASSERT_DISABLED
-    ASSERT(!m_deletionHasBegun);
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
+    ASSERT_WITH_SECURITY_IMPLICATION(!m_deletionHasBegun);
     m_deletionHasBegun = true;
 #endif
 }

Modified: trunk/Source/WebCore/rendering/style/RenderStyle.h (203030 => 203031)


--- trunk/Source/WebCore/rendering/style/RenderStyle.h	2016-07-09 15:39:34 UTC (rev 203030)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.h	2016-07-09 15:47:29 UTC (rev 203031)
@@ -468,7 +468,7 @@
 // don't inherit
     NonInheritedFlags noninherited_flags;
 
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
     bool m_deletionHasBegun { false };
 #endif
 
@@ -498,7 +498,7 @@
     static RenderStyle createAnonymousStyleWithDisplay(const RenderStyle& parentStyle, EDisplay);
     static RenderStyle createStyleInheritingFromPseudoStyle(const RenderStyle& pseudoStyle);
 
-#if !ASSERT_DISABLED
+#if !ASSERT_DISABLED || ENABLE(SECURITY_ASSERTIONS)
     bool deletionHasBegun() const { return m_deletionHasBegun; }
 #endif
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to