From 5b8a6900d3c0e757044b7f5c6e9eb54f9cb18154 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Mon, 13 Feb 2012 16:41:20 +0100 Subject: [PATCH] GDataInputStream: don't segfault on async line reads 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 --- gio/gdatainputstream.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gio/gdatainputstream.c b/gio/gdatainputstream.c index d5dd2fd..ea26aeb 100644 --- a/gio/gdatainputstream.c +++ b/gio/gdatainputstream.c @@ -1284,6 +1284,9 @@ g_data_input_stream_read_line_finish_utf8 (GDataInputStream *stream, gchar *res; res = g_data_input_stream_read_line_finish (stream, result, length, error); + if (!res) + return NULL; + if (!g_utf8_validate (res, -1, NULL)) { g_set_error_literal (error, G_CONVERT_ERROR, -- 2.7.4