Title: [282531] releases/WebKitGTK/webkit-2.32/Source/WTF
Revision
282531
Author
[email protected]
Date
2021-09-16 03:36:13 -0700 (Thu, 16 Sep 2021)

Log Message

Merge r278132 - [Hardening] Have the Ref<> destructor null out its pointer
https://bugs.webkit.org/show_bug.cgi?id=226293
<rdar://problem/78532149>

Reviewed by Geoffrey Garen.

* wtf/Ref.h:
(WTF::Ref::~Ref):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog (282530 => 282531)


--- releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog	2021-09-16 10:32:28 UTC (rev 282530)
+++ releases/WebKitGTK/webkit-2.32/Source/WTF/ChangeLog	2021-09-16 10:36:13 UTC (rev 282531)
@@ -1,3 +1,14 @@
+2021-05-26  Chris Dumez  <[email protected]>
+
+        [Hardening] Have the Ref<> destructor null out its pointer
+        https://bugs.webkit.org/show_bug.cgi?id=226293
+        <rdar://problem/78532149>
+
+        Reviewed by Geoffrey Garen.
+
+        * wtf/Ref.h:
+        (WTF::Ref::~Ref):
+
 2021-05-17  Wenson Hsieh  <[email protected]>
 
         [GPU Process] Object identifiers with the deleted value should cause MESSAGE_CHECKs

Modified: releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/Ref.h (282530 => 282531)


--- releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/Ref.h	2021-09-16 10:32:28 UTC (rev 282530)
+++ releases/WebKitGTK/webkit-2.32/Source/WTF/wtf/Ref.h	2021-09-16 10:36:13 UTC (rev 282531)
@@ -57,8 +57,8 @@
         if (__asan_address_is_poisoned(this))
             __asan_unpoison_memory_region(this, sizeof(*this));
 #endif
-        if (m_ptr)
-            PtrTraits::unwrap(m_ptr)->deref();
+        if (auto* ptr = PtrTraits::exchange(m_ptr, nullptr))
+            ptr->deref();
     }
 
     Ref(T& object)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to