AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 21:51:08 +00:00
Code Issues Projects Releases Wiki Activity

clipboard: Fix reading of files

Browse Source 
Make sure writing a terminating null byte actually works and we don't
just ignore the error message.
This commit is contained in:
Benjamin Otte 2021-04-26 21:32:00 +02:00
parent f34e3c573b
commit 1be899459c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdk/gdkcontentdeserializer.c
View File

@ -740,7 +740,8 @@ file_uri_deserializer_finish (GObject *source,
}
/* write terminating NULL */
if (!g_output_stream_write (stream, "", 1, NULL, &error))
if (g_output_stream_write (stream, "", 1, NULL, &error) < 0 ||
!g_output_stream_close (stream, NULL, &error))
{
gdk_content_deserializer_return_error (deserializer, error);
return;
@ -780,7 +781,7 @@ file_uri_deserializer (GdkContentDeserializer *deserializer)
g_output_stream_splice_async (output,
gdk_content_deserializer_get_input_stream (deserializer),
G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE,
gdk_content_deserializer_get_priority (deserializer),
gdk_content_deserializer_get_cancellable (deserializer),
file_uri_deserializer_finish,