luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-21 19:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

goutputstream: Report input stream read failure correctly

Browse Source 
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
(cherry picked from commit 16e0a5a886c60a648e74afd12c0cbeeb58d6d522)
This commit is contained in:
John Hiesey 2015-10-07 17:34:17 -07:00 committed by Alexander Larsson
parent 2b8b9361f9
commit 96af958603
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/goutputstream.c
View File

@ -605,7 +605,8 @@ 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! */
res = g_output_stream_internal_close (stream, cancellable, error); if (!g_output_stream_internal_close (stream, cancellable, error))
res = FALSE;
} }
if (res) if (res)