summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gtk/css/gtkcssdataurl.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/gtk/css/gtkcssdataurl.c b/gtk/css/gtkcssdataurl.c
index 6645b4835d..cc430378f2 100644
--- a/gtk/css/gtkcssdataurl.c
+++ b/gtk/css/gtkcssdataurl.c
@@ -152,13 +152,23 @@ gtk_css_data_url_parse (const char *url,
gsize read;
gsize written;
gpointer data;
+ GError *local_error = NULL;
data = g_convert_with_fallback (bdata, bsize,
"UTF-8", charset,
(char *) "*",
- &read, &written, NULL);
+ &read, &written, &local_error);
g_free (bdata);
+ if (local_error)
+ {
+ g_propagate_error (error, local_error);
+ g_free (charset);
+ g_free (data);
+ return NULL;
+ }
+
+
bdata = data;
bsize = written;
}