Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Fix GTask reference counting #56866

Merged
robert-ancell merged 2 commits into from
Dec 3, 2024
Merged

Fix GTask reference counting #56866

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de3553c
Fix GTask reference counting
robert-ancell Nov 28, 2024
ad11379
Merge branch 'main' into linux-task-leak
robert-ancell Dec 2, 2024
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
9 changes: 5 additions & 4 deletions shell/platform/linux/fl_basic_message_channel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ static void message_cb(FlBinaryMessenger* messenger,
static void message_response_cb(GObject* object,
GAsyncResult* result,
gpointer user_data) {
GTask* task = G_TASK(user_data);
g_task_return_pointer(task, result, g_object_unref);
g_autoptr(GTask) task = G_TASK(user_data);
g_task_return_pointer(task, g_object_ref(result), g_object_unref);
}

// Called when the channel handler is closed.
Expand Down Expand Up @@ -257,8 +257,9 @@ G_MODULE_EXPORT FlValue* fl_basic_message_channel_send_finish(
g_return_val_if_fail(FL_IS_BASIC_MESSAGE_CHANNEL(self), nullptr);
g_return_val_if_fail(g_task_is_valid(result, self), nullptr);

g_autoptr(GTask) task = G_TASK(result);
GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
GTask* task = G_TASK(result);
g_autoptr(GAsyncResult) r =
G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));

g_autoptr(GBytes) message =
fl_binary_messenger_send_on_channel_finish(self->messenger, r, error);
Expand Down
9 changes: 5 additions & 4 deletions shell/platform/linux/fl_binary_messenger.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,8 @@ static gboolean send_response(FlBinaryMessenger* messenger,
static void platform_message_ready_cb(GObject* object,
GAsyncResult* result,
gpointer user_data) {
GTask* task = G_TASK(user_data);
g_task_return_pointer(task, result, g_object_unref);
g_autoptr(GTask) task = G_TASK(user_data);
g_task_return_pointer(task, g_object_ref(result), g_object_unref);
}

static void send_on_channel(FlBinaryMessenger* messenger,
Expand Down Expand Up @@ -290,8 +290,9 @@ static GBytes* send_on_channel_finish(FlBinaryMessenger* messenger,
FlBinaryMessengerImpl* self = FL_BINARY_MESSENGER_IMPL(messenger);
g_return_val_if_fail(g_task_is_valid(result, self), FALSE);

g_autoptr(GTask) task = G_TASK(result);
GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
GTask* task = G_TASK(result);
g_autoptr(GAsyncResult) r =
G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));

g_autoptr(FlEngine) engine = FL_ENGINE(g_weak_ref_get(&self->engine));
if (engine == nullptr) {
Expand Down
9 changes: 5 additions & 4 deletions shell/platform/linux/fl_method_channel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ static void message_cb(FlBinaryMessenger* messenger,
static void message_response_cb(GObject* object,
GAsyncResult* result,
gpointer user_data) {
GTask* task = G_TASK(user_data);
g_task_return_pointer(task, result, g_object_unref);
g_autoptr(GTask) task = G_TASK(user_data);
g_task_return_pointer(task, g_object_ref(result), g_object_unref);
}

// Called when the channel handler is closed.
Expand Down Expand Up @@ -196,8 +196,9 @@ G_MODULE_EXPORT FlMethodResponse* fl_method_channel_invoke_method_finish(
g_return_val_if_fail(FL_IS_METHOD_CHANNEL(self), nullptr);
g_return_val_if_fail(g_task_is_valid(result, self), nullptr);

g_autoptr(GTask) task = G_TASK(result);
GAsyncResult* r = G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));
GTask* task = G_TASK(result);
g_autoptr(GAsyncResult) r =
G_ASYNC_RESULT(g_task_propagate_pointer(task, nullptr));

g_autoptr(GBytes) response =
fl_binary_messenger_send_on_channel_finish(self->messenger, r, error);
Expand Down