projects
/
gtk4.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a020cf7
)
css: Propagate charset conversion errors
author
Matthias Clasen
<mclasen@redhat.com>
Thu, 11 Aug 2022 11:17:55 +0000
(07:17 -0400)
committer
Matthias Clasen
<mclasen@redhat.com>
Thu, 11 Aug 2022 11:29:56 +0000
(07:29 -0400)
Lets not throw away informtation that
helps to figure out why things fail.
gtk/css/gtkcssdataurl.c
patch
|
blob
|
history
diff --git
a/gtk/css/gtkcssdataurl.c
b/gtk/css/gtkcssdataurl.c
index 6645b4835d628acd2bd8aa23ce036f2df7a5df48..cc430378f225a8dfcb36e37c92a4052e37891059 100644
(file)
--- 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;
}