luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-23 20:46:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

GDataInputStream: don't segfault on async line reads

Browse Source 
If an async line read fails, it returns NULL. In that case, we
must return NULL before validating the line, or we segfault.

https://bugzilla.gnome.org/show_bug.cgi?id=658484
This commit is contained in:
Giovanni Campagna 2012-02-13 16:41:20 +01:00
parent 96671ce815
commit 5b8a6900d3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gdatainputstream.c
View File

@ -1284,6 +1284,9 @@ g_data_input_stream_read_line_finish_utf8 (GDataInputStream *stream,
gchar *res; gchar *res;
res = g_data_input_stream_read_line_finish (stream, result, length, error); res = g_data_input_stream_read_line_finish (stream, result, length, error);
if (!res)
return NULL;
if (!g_utf8_validate (res, -1, NULL)) if (!g_utf8_validate (res, -1, NULL))
{ {
g_set_error_literal (error, G_CONVERT_ERROR, g_set_error_literal (error, G_CONVERT_ERROR,