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

Don't close stream twice when splicing

Browse Source 
Ensure that the output/target stream in a g_output_stream_splice_async()
operation is marked as closed if G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET is
passed to g_output_stream_splice_async(). This removes the possibility of
local FDs being closed twice because the stream's not marked as closed.

This is implemented by calling g_output_stream_close() from within
g_output_stream_splice_async() instead of calling the stream's close_fn()
directly.

Closes: bgo#659324
This commit is contained in:
Philip Withnall 2011-09-19 10:13:52 +02:00 committed by Alexander Larsson
parent 808035666a
commit fe27bf0037
1 changed files with 53 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
gio/goutputstream.c
View File

@ -95,6 +95,9 @@ static void g_output_stream_real_close_async (GOutputStream *s
static gboolean g_output_stream_real_close_finish (GOutputStream *stream, static gboolean g_output_stream_real_close_finish (GOutputStream *stream,
GAsyncResult *result, GAsyncResult *result,
GError **error); GError **error);
static gboolean _g_output_stream_close_internal (GOutputStream *stream,
GCancellable *cancellable,
GError **error);
static void static void
g_output_stream_finalize (GObject *object) g_output_stream_finalize (GObject *object)
@ -459,9 +462,7 @@ g_output_stream_real_splice (GOutputStream *stream,
if (flags & G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET) if (flags & G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET)
{ {
/* But write errors on close are bad! */ /* But write errors on close are bad! */
if (class->close_fn && res = _g_output_stream_close_internal (stream, cancellable, error);
!class->close_fn (stream, cancellable, error))
res = FALSE;
} }
if (res) if (res)
@ -470,6 +471,54 @@ g_output_stream_real_splice (GOutputStream *stream,
return -1; return -1;
} }
/* Must always be called inside
* g_output_stream_set_pending()/g_output_stream_clear_pending(). */
static gboolean
_g_output_stream_close_internal (GOutputStream *stream,
GCancellable *cancellable,
GError **error)
{
GOutputStreamClass *class;
gboolean res;
if (stream->priv->closed)
return TRUE;
class = G_OUTPUT_STREAM_GET_CLASS (stream);
stream->priv->closing = TRUE;
if (cancellable)
g_cancellable_push_current (cancellable);
if (class->flush)
res = class->flush (stream, cancellable, error);
else
res = TRUE;
if (!res)
{
/* flushing caused the error that we want to return,
* but we still want to close the underlying stream if possible
*/
if (class->close_fn)
class->close_fn (stream, cancellable, NULL);
}
else
{
res = TRUE;
if (class->close_fn)
res = class->close_fn (stream, cancellable, error);
}
if (cancellable)
g_cancellable_pop_current (cancellable);
stream->priv->closing = FALSE;
stream->priv->closed = TRUE;
return res;
}
/** /**
* g_output_stream_close: * g_output_stream_close:
@ -514,49 +563,18 @@ g_output_stream_close (GOutputStream *stream,
GCancellable *cancellable, GCancellable *cancellable,
GError **error) GError **error)
{ {
GOutputStreamClass *class;
gboolean res; gboolean res;
g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream), FALSE); g_return_val_if_fail (G_IS_OUTPUT_STREAM (stream), FALSE);
class = G_OUTPUT_STREAM_GET_CLASS (stream);
if (stream->priv->closed) if (stream->priv->closed)
return TRUE; return TRUE;
if (!g_output_stream_set_pending (stream, error)) if (!g_output_stream_set_pending (stream, error))
return FALSE; return FALSE;
stream->priv->closing = TRUE; res = _g_output_stream_close_internal (stream, cancellable, error);
if (cancellable)
g_cancellable_push_current (cancellable);
if (class->flush)
res = class->flush (stream, cancellable, error);
else
res = TRUE;
if (!res)
{
/* flushing caused the error that we want to return,
* but we still want to close the underlying stream if possible
*/
if (class->close_fn)
class->close_fn (stream, cancellable, NULL);
}
else
{
res = TRUE;
if (class->close_fn)
res = class->close_fn (stream, cancellable, error);
}
if (cancellable)
g_cancellable_pop_current (cancellable);
stream->priv->closing = FALSE;
stream->priv->closed = TRUE;
g_output_stream_clear_pending (stream); g_output_stream_clear_pending (stream);
return res; return res;