Skip to content

events: fix double free with multiple subscribers #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
frbncis wants to merge 2 commits into
base: master
Choose a base branch
from
Open

events: fix double free with multiple subscribers #160

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6994815
events: fix double free with multiple subs
frbncis Apr 17, 2021
140ceef
events: remove unused test code
frbncis Apr 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 29 additions & 13 deletions rwatch/event/event_service.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,22 +139,38 @@ void event_service_event_trigger(EventServiceCommand command, void *data, Destro
{
if (conn->command == command)
{
// LOG_INFO("Triggering %x %x %x", data, destroy, conn->callback);
LOG_DEBUG(
"Checking %s subscriber %x for event type %x",
conn->thread->thread_type == AppThreadMainApp ? "main" : "overlay",
conn,
command);

/* Step 1. Invoke the subscriber callback - this can either
* be a handler on the app or overlay thread */
if (conn->thread == _this_thread && conn->callback)
conn->callback(command, data, conn->context);

/* Step 2. App processing done, post it to overlay thread */
if (_this_thread->thread_type == AppThreadMainApp)
overlay_window_post_event(command, data, destroy);

/* Step 3. if we are the overlay thread, then destroy this packet */
else if (_this_thread->thread_type == AppThreadOverlay)
{
if (destroy)
destroy(data);

appmanager_post_draw_message(1);
LOG_DEBUG("Triggering callback %x with %x %x", conn->callback, command, data);
conn->callback(command, data, conn->context);
}
}
}

/* Step 2. Subscriber is done, post it to overlay thread if this is the main thread */
if (_this_thread->thread_type == AppThreadMainApp)
{
LOG_DEBUG("Posting event to overlay thread %x %x %x", command, data, destroy);
overlay_window_post_event(command, data, destroy);
}

/* Step 3. if we are the overlay thread, then destroy this packet */
else if (_this_thread->thread_type == AppThreadOverlay)
{
if (destroy)
{
LOG_DEBUG("Destroying event packet data %x", data);
destroy(data);
}

appmanager_post_draw_message(1);
}
}