Lightpanda: the headless browser designed for AI and automation
fix potential UAF
Karl Seguinfe5012c48206
diff --git a/src/browser/webapi/DOMNodeIterator.zig b/src/browser/webapi/DOMNodeIterator.zigindex 818dc3d2d..f7ef1ec34 100644--- a/src/browser/webapi/DOMNodeIterator.zig+++ b/src/browser/webapi/DOMNodeIterator.zig@@ -36,9 +36,7 @@ _filter: NodeFilter,_reference_node: *Node,_pointer_before_reference_node: bool,_active: bool = false,-// Intrusive link for Frame._live_node_iterators (pre-removing steps).-// Iterators are slab-allocated and live as long as the frame, so they are-// never unlinked.+_frame_loader_id: u32,_iterator_link: std.DoublyLinkedList.Node = .{},pub fn init(root: *Node, what_to_show: u32, filter: ?FilterOpts, frame: *Frame) !*DOMNodeIterator {@@ -48,23 +46,48 @@ pub fn init(root: *Node, what_to_show: u32, filter: ?FilterOpts, frame: *Frame)._filter = node_filter,._reference_node = root,._what_to_show = what_to_show,+ ._frame_loader_id = frame._loader_id,._pointer_before_reference_node = true,});frame._live_node_iterators.append(&iterator._iterator_link);return iterator;}+pub fn deinit(self: *DOMNodeIterator, page: *Page) void {+ if (page.findFrameByLoaderId(self._frame_loader_id)) |frame| {+ frame._live_node_iterators.remove(&self._iterator_link);+ }+ self._filter.deinit();+ page.factory.destroy(self);+}++pub fn releaseRef(self: *DOMNodeIterator, page: *Page) void {+ self._rc.release(self, page);+}++pub fn acquireRef(self: *DOMNodeIterator) void {+ self._rc.acquire();+}++pub fn getRoot(self: *const DOMNodeIterator) *Node {+ return self._root;+}+// DOM "node iterator pre-removing steps", run while the tree still contains// to_be_removed.pub fn nodeWillBeRemoved(self: *DOMNodeIterator, to_be_removed: *Node) void {- // Removing the root or one of its ancestors leaves the iterator alone.- if (to_be_removed == self._root or to_be_removed.contains(self._root)) return;- if (to_be_removed != self._reference_node and !to_be_removed.contains(self._reference_node)) return;+ if (to_be_removed.contains(self._root)) {+ // Removing the root or one of its ancestors leaves the iterator alone.+ return;+ }+ if (to_be_removed != self._reference_node and to_be_removed.contains(self._reference_node) == false) {+ return;+ }if (self._pointer_before_reference_node) {// The first node following to_be_removed's subtree, if any.var node = to_be_removed;- while (true) {+ while (node != self._root) {if (node.nextSibling()) |sibling| {self._reference_node = sibling;return;@@ -87,23 +110,6 @@ pub fn nodeWillBeRemoved(self: *DOMNodeIterator, to_be_removed: *Node) void {}}-pub fn deinit(self: *DOMNodeIterator, page: *Page) void {- self._filter.deinit();- page.factory.destroy(self);-}--pub fn releaseRef(self: *DOMNodeIterator, page: *Page) void {- self._rc.release(self, page);-}--pub fn acquireRef(self: *DOMNodeIterator) void {- self._rc.acquire();-}--pub fn getRoot(self: *const DOMNodeIterator) *Node {- return self._root;-}-pub fn getReferenceNode(self: *const DOMNodeIterator) *Node {return self._reference_node;}diff --git a/src/browser/webapi/DOMTreeWalker.zig b/src/browser/webapi/DOMTreeWalker.zigindex 1949f1292..0e07dab95 100644--- a/src/browser/webapi/DOMTreeWalker.zig+++ b/src/browser/webapi/DOMTreeWalker.zig@@ -33,8 +33,6 @@ _root: *Node,_what_to_show: u32,_filter: NodeFilter,_current: *Node,-// Set while the filter callback runs; a walker method called from inside-// its own filter must throw InvalidStateError._active: bool = false,pub fn init(root: *Node, what_to_show: u32, filter: ?FilterOpts, frame: *Frame) !*DOMTreeWalker {diff --git a/src/browser/webapi/NodeFilter.zig b/src/browser/webapi/NodeFilter.zigindex 598e4889f..8e44afe4f 100644--- a/src/browser/webapi/NodeFilter.zig+++ b/src/browser/webapi/NodeFilter.zig@@ -25,8 +25,7 @@ _opts: ?FilterOpts,pub const FilterOpts = union(enum) {function: js.Function.Global,- // Any object is a valid callback interface; whether its acceptNode- // member is callable is only checked when the filter is invoked.+ // Per spec, the validity of this has to be checked in each acceptNode call.object: js.Object.Global,};@@ -67,10 +66,7 @@ pub fn acceptNode(self: *const NodeFilter, node: *Node, local: *const js.Local)switch (opts) {.function => |func| return local.toLocal(func).callRethrow(i32, .{node}),.object => |obj| {- // Per WebIDL "call a user object's operation": the acceptNode- // member is looked up on every invocation (rethrowing getter- // errors), must be callable (TypeError otherwise), and is- // invoked with the filter object as its this value.+ // Per spec, the acceptNode member is looked up on every invocationconst filter_obj = obj.local(local);const member = try filter_obj.get("acceptNode");if (!member.isFunction()) {