Module: wine Branch: master Commit: 76f622a663bfb6e1cd46baaf25d4c55b7a236198 URL: https://gitlab.winehq.org/wine/wine/-/commit/76f622a663bfb6e1cd46baaf25d4c55...
Author: Gabriel Ivăncescu gabrielopcode@gmail.com Date: Tue Aug 15 19:46:27 2023 +0300
mshtml: Release the event target during node unlink.
The event target can participate in a cycle. Also since release_event_target can now potentially be called multiple times, we have to NULL the rb tree to make it re-entrant safe.
Signed-off-by: Gabriel Ivăncescu gabrielopcode@gmail.com
---
dlls/mshtml/htmlevent.c | 3 ++- dlls/mshtml/htmlnode.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 3b012980960..9f3dbae81d7 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -4552,11 +4552,12 @@ void release_event_target(EventTarget *event_target) WINE_RB_FOR_EACH_ENTRY_DESTRUCTOR(iter, iter2, &event_target->handler_map, listener_container_t, entry) { while(!list_empty(&iter->listeners)) { event_listener_t *listener = LIST_ENTRY(list_head(&iter->listeners), event_listener_t, entry); + list_remove(&listener->entry); if(listener->function) IDispatch_Release(listener->function); - list_remove(&listener->entry); free(listener); } free(iter); } + rb_destroy(&event_target->handler_map, NULL, NULL); } diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 192e9c5b685..893a1a738f7 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1443,6 +1443,7 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) if(This->vtbl->unlink) This->vtbl->unlink(This);
+ release_event_target(&This->event_target); unlink_ref(&This->nsnode);
if(This->doc) { @@ -1456,7 +1457,6 @@ void HTMLDOMNode_unlink(DispatchEx *dispex) void HTMLDOMNode_destructor(DispatchEx *dispex) { HTMLDOMNode *This = HTMLDOMNode_from_DispatchEx(dispex); - release_event_target(&This->event_target); if(This->vtbl->destructor) This->vtbl->destructor(This); free(This);