goutputstream: Report input stream read failure correctly

When G_OUTPUT_STREAM_CLOSE_TARGET is set,
g_output_stream_real_splice was not returning -1 in any error
cases, since the success flag was being overwritten.

https://bugzilla.gnome.org/show_bug.cgi?id=756255
This commit is contained in:
John Hiesey 2015-10-07 17:34:17 -07:00 committed by Alexander Larsson
parent fb9df27776
commit 16e0a5a886

View File

@ -605,7 +605,8 @@ g_output_stream_real_splice (GOutputStream *stream,
if (flags & G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET)
{
/* But write errors on close are bad! */
res = g_output_stream_internal_close (stream, cancellable, error);
if (!g_output_stream_internal_close (stream, cancellable, error))
res = FALSE;
}
if (res)