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

gfile: don't report completion twice on g_file_load_contents error

Browse Source 
When an error occurs while reading the file input stream in
g_file_load_contents (e.g. because the operation was cancelled), the
code is correctly calling g_task_return_error(), but in the callback
from the close operation, g_task_return_boolean() will be called again.

Code that cleans up its state in the async callback will then be called
twice, leading to invalid memory access.

https://bugzilla.gnome.org/show_bug.cgi?id=692202
This commit is contained in:
Cosimo Cecchi 2013-01-20 14:00:50 -05:00
parent 40f8e15c1b
commit e908b50371
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gfile.c
View File

@ -6514,11 +6514,12 @@ load_contents_read_callback (GObject *obj,
if (read_size < 0) if (read_size < 0)
{ {
/* EOF, close the file */
g_task_return_error (data->task, error); g_task_return_error (data->task, error);
g_input_stream_close_async (stream, 0, g_object_unref (data->task);
g_task_get_cancellable (data->task),
load_contents_close_callback, data); /* Close the file ignoring any error */
g_input_stream_close_async (stream, 0, NULL, NULL, NULL);
g_object_unref (stream);
} }
else if (read_size == 0) else if (read_size == 0)
{ {