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

Check that close_fn is not %NULL before calling (#578499)

Browse Source 
Some streams have no close function, so this caused a crash.
This commit is contained in:
Alexander Larsson 2009-05-20 13:37:55 +02:00
parent 0a280dadec
commit c20b8d4d53
3 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gio/ginputstream.c
View File

@ -1165,13 +1165,16 @@ close_async_thread (GSimpleAsyncResult *res,
cancellation, since we want to close things anyway, although cancellation, since we want to close things anyway, although
possibly in a quick-n-dirty way. At least we never want to leak possibly in a quick-n-dirty way. At least we never want to leak
open handles */ open handles */
class = G_INPUT_STREAM_GET_CLASS (object); class = G_INPUT_STREAM_GET_CLASS (object);
result = class->close_fn (G_INPUT_STREAM (object), cancellable, &error); if (class->close_fn)
if (!result)
{ {
g_simple_async_result_set_from_error (res, error); result = class->close_fn (G_INPUT_STREAM (object), cancellable, &error);
g_error_free (error); if (!result)
{
g_simple_async_result_set_from_error (res, error);
g_error_free (error);
}
} }
} }

11
gio/giostream.c
View File

@ -569,11 +569,14 @@ close_async_thread (GSimpleAsyncResult *res,
open handles */ open handles */
class = G_IO_STREAM_GET_CLASS (object); class = G_IO_STREAM_GET_CLASS (object);
result = class->close_fn (G_IO_STREAM (object), cancellable, &error); if (class->close_fn)
if (!result)
{ {
g_simple_async_result_set_from_error (res, error); result = class->close_fn (G_IO_STREAM (object), cancellable, &error);
g_error_free (error); if (!result)
{
g_simple_async_result_set_from_error (res, error);
g_error_free (error);
}
} }
} }

18
gio/goutputstream.c
View File

@ -456,13 +456,14 @@ 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 (stream, cancellable, error)) if (class->close_fn &&
!class->close_fn (stream, cancellable, error))
res = FALSE; res = FALSE;
} }
if (res) if (res)
return bytes_copied; return bytes_copied;
return -1; return -1;
} }
@ -1307,13 +1308,16 @@ close_async_thread (GSimpleAsyncResult *res,
cancellation, since we want to close things anyway, although cancellation, since we want to close things anyway, although
possibly in a quick-n-dirty way. At least we never want to leak possibly in a quick-n-dirty way. At least we never want to leak
open handles */ open handles */
class = G_OUTPUT_STREAM_GET_CLASS (object); class = G_OUTPUT_STREAM_GET_CLASS (object);
result = class->close_fn (G_OUTPUT_STREAM (object), cancellable, &error); if (class->close_fn)
if (!result)
{ {
g_simple_async_result_set_from_error (res, error); result = class->close_fn (G_OUTPUT_STREAM (object), cancellable, &error);
g_error_free (error); if (!result)
{
g_simple_async_result_set_from_error (res, error);
g_error_free (error);
}
} }
} }