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

gio: iostream: use GTask instead of internal pointer

Browse Source 
This fixes an infinite recursion loop when calling
g_io_stream_close_async() on a SoupIOStream.

https://bugzilla.gnome.org/show_bug.cgi?id=722723
This commit is contained in:
Lionel Landwerlin 2014-01-21 19:12:08 +00:00 committed by Dan Winship
parent 24fdee7a78
commit 1565a49144
1 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gio/giostream.c
View File

@ -73,7 +73,6 @@ enum
struct _GIOStreamPrivate { struct _GIOStreamPrivate {
guint closed : 1; guint closed : 1;
guint pending : 1; guint pending : 1;
GAsyncReadyCallback outstanding_callback;
}; };
static gboolean g_io_stream_real_close (GIOStream *stream, static gboolean g_io_stream_real_close (GIOStream *stream,
@ -414,12 +413,25 @@ async_ready_close_callback_wrapper (GObject *source_object,
gpointer user_data) gpointer user_data)
{ {
GIOStream *stream = G_IO_STREAM (source_object); GIOStream *stream = G_IO_STREAM (source_object);
GIOStreamClass *klass = G_IO_STREAM_GET_CLASS (stream);
GTask *task = user_data;
GError *error = NULL;
gboolean success;
stream->priv->closed = TRUE; stream->priv->closed = TRUE;
g_io_stream_clear_pending (stream); g_io_stream_clear_pending (stream);
if (stream->priv->outstanding_callback)
(*stream->priv->outstanding_callback) (source_object, res, user_data); if (g_async_result_legacy_propagate_error (res, &error))
g_object_unref (stream); success = FALSE;
else
success = klass->close_finish (stream, res, &error);
if (error)
g_task_return_error (task, error);
else
g_task_return_boolean (task, success);
g_object_unref (task);
} }
/** /**
@ -452,15 +464,14 @@ g_io_stream_close_async (GIOStream *stream,
{ {
GIOStreamClass *class; GIOStreamClass *class;
GError *error = NULL; GError *error = NULL;
GTask *task;
g_return_if_fail (G_IS_IO_STREAM (stream)); g_return_if_fail (G_IS_IO_STREAM (stream));
task = g_task_new (stream, cancellable, callback, user_data);
if (stream->priv->closed) if (stream->priv->closed)
{ {
GTask *task;
task = g_task_new (stream, cancellable, callback, user_data);
g_task_set_source_tag (task, g_io_stream_close_async);
g_task_return_boolean (task, TRUE); g_task_return_boolean (task, TRUE);
g_object_unref (task); g_object_unref (task);
return; return;
@ -468,17 +479,15 @@ g_io_stream_close_async (GIOStream *stream,
if (!g_io_stream_set_pending (stream, &error)) if (!g_io_stream_set_pending (stream, &error))
{ {
g_task_report_error (stream, callback, user_data, g_task_return_error (task, error);
g_io_stream_close_async, g_object_unref (task);
error);
return; return;
} }
class = G_IO_STREAM_GET_CLASS (stream); class = G_IO_STREAM_GET_CLASS (stream);
stream->priv->outstanding_callback = callback;
g_object_ref (stream);
class->close_async (stream, io_priority, cancellable, class->close_async (stream, io_priority, cancellable,
async_ready_close_callback_wrapper, user_data); async_ready_close_callback_wrapper, task);
} }
/** /**
@ -499,18 +508,10 @@ g_io_stream_close_finish (GIOStream *stream,
GAsyncResult *result, GAsyncResult *result,
GError **error) GError **error)
{ {
GIOStreamClass *class;
g_return_val_if_fail (G_IS_IO_STREAM (stream), FALSE); g_return_val_if_fail (G_IS_IO_STREAM (stream), FALSE);
g_return_val_if_fail (G_IS_ASYNC_RESULT (result), FALSE); g_return_val_if_fail (g_task_is_valid (result, stream), FALSE);
if (g_async_result_legacy_propagate_error (result, error)) return g_task_propagate_boolean (G_TASK (result), error);
return FALSE;
else if (g_async_result_is_tagged (result, g_io_stream_close_async))
return g_task_propagate_boolean (G_TASK (result), error);
class = G_IO_STREAM_GET_CLASS (stream);
return class->close_finish (stream, result, error);
} }