From eda566d112bf065ff63aa50c39fad4cd6aa99608 Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Thu, 20 Oct 2022 19:46:39 +0200 Subject: [PATCH] LibWeb: Add GC finalizer to DOM::NodeIterator It's potentially unsafe to access `m_root` in the destructor since it may have been swept, so move unregistration of the NodeIterator into a GC finalizer instead. --- Userland/Libraries/LibWeb/DOM/NodeIterator.cpp | 5 ++++- Userland/Libraries/LibWeb/DOM/NodeIterator.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Userland/Libraries/LibWeb/DOM/NodeIterator.cpp b/Userland/Libraries/LibWeb/DOM/NodeIterator.cpp index 7324659a86c..9bae56093f8 100644 --- a/Userland/Libraries/LibWeb/DOM/NodeIterator.cpp +++ b/Userland/Libraries/LibWeb/DOM/NodeIterator.cpp @@ -19,8 +19,11 @@ NodeIterator::NodeIterator(Node& root) root.document().register_node_iterator({}, *this); } -NodeIterator::~NodeIterator() +NodeIterator::~NodeIterator() = default; + +void NodeIterator::finalize() { + Base::finalize(); m_root->document().unregister_node_iterator({}, *this); } diff --git a/Userland/Libraries/LibWeb/DOM/NodeIterator.h b/Userland/Libraries/LibWeb/DOM/NodeIterator.h index 2795dcb83e2..876e77c1c62 100644 --- a/Userland/Libraries/LibWeb/DOM/NodeIterator.h +++ b/Userland/Libraries/LibWeb/DOM/NodeIterator.h @@ -38,6 +38,7 @@ private: explicit NodeIterator(Node& root); virtual void visit_edges(Cell::Visitor&) override; + virtual void finalize() override; enum class Direction { Next,