luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-03 17:56:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

gtask: Check an error hasn’t been returned when calling g_task_return*()

Browse Source 
These functions already check to see if a successful result has already
been returned; expand them to also check to see if an error has been
returned.

We can’t just check GTask.result_set, as that’s actually an indicator
for whether the GTask.result member is filled — when
g_task_propagate_*() is called, it’s cleared again. We need a new state
bit.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://gitlab.gnome.org/GNOME/glib/issues/1525
This commit is contained in:
Philip Withnall 2018-03-21 14:47:52 +00:00
parent 03232bd6a6
commit bea3770935
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gio/gtask.c
View File

@ -575,6 +575,7 @@ struct _GTask {
GDestroyNotify result_destroy;
gboolean had_error;
gboolean result_set;
gboolean ever_returned;
};
#define G_TASK_IS_THREADED(task) ((task)->task_func != NULL)
@ -1176,6 +1177,9 @@ g_task_return (GTask *task,
{
GSource *source;
if (type != G_TASK_RETURN_FROM_THREAD)
task->ever_returned = TRUE;
if (type == G_TASK_RETURN_SUCCESS)
task->result_set = TRUE;
@ -1596,7 +1600,7 @@ g_task_return_pointer (GTask *task,
GDestroyNotify result_destroy)
{
g_return_if_fail (G_IS_TASK (task));
g_return_if_fail (task->result_set == FALSE);
g_return_if_fail (!task->ever_returned);
task->result.pointer = result;
task->result_destroy = result_destroy;
@ -1654,7 +1658,7 @@ g_task_return_int (GTask *task,
gssize result)
{
g_return_if_fail (G_IS_TASK (task));
g_return_if_fail (task->result_set == FALSE);
g_return_if_fail (!task->ever_returned);
task->result.size = result;
@ -1709,7 +1713,7 @@ g_task_return_boolean (GTask *task,
gboolean result)
{
g_return_if_fail (G_IS_TASK (task));
g_return_if_fail (task->result_set == FALSE);
g_return_if_fail (!task->ever_returned);
task->result.boolean = result;
@ -1772,7 +1776,7 @@ g_task_return_error (GTask *task,
GError *error)
{
g_return_if_fail (G_IS_TASK (task));
g_return_if_fail (task->result_set == FALSE);
g_return_if_fail (!task->ever_returned);
g_return_if_fail (error != NULL);
task->error = error;
@ -1833,7 +1837,7 @@ g_task_return_error_if_cancelled (GTask *task)
GError *error = NULL;
g_return_val_if_fail (G_IS_TASK (task), FALSE);
g_return_val_if_fail (task->result_set == FALSE, FALSE);
g_return_val_if_fail (!task->ever_returned, FALSE);
if (g_cancellable_set_error_if_cancelled (task->cancellable, &error))
{