[gtk+] Themes with specified gap images but no actual file crash.
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Themes with specified gap images but no actual file crash.
- Date: Sat, 23 Nov 2013 03:21:46 +0000 (UTC)
commit 0d396abf22f09ae36fa89aa109589a1a726079d7
Author: Jehan <jehan girinstud io>
Date: Mon Nov 18 00:56:44 2013 +1300
Themes with specified gap images but no actual file crash.
https://bugzilla.gnome.org/show_bug.cgi?id=712536
modules/engines/pixbuf/pixbuf-rc-style.c | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
---
diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c
index db1830f..1d7972a 100644
--- a/modules/engines/pixbuf/pixbuf-rc-style.c
+++ b/modules/engines/pixbuf/pixbuf-rc-style.c
@@ -769,6 +769,27 @@ theme_parse_image(GtkSettings *settings,
data->overlay = NULL;
}
+ if (data->gap && !data->gap->filename)
+ {
+ g_scanner_warn (scanner, "Gap image options specified without filename");
+ theme_pixbuf_destroy (data->gap);
+ data->gap = NULL;
+ }
+
+ if (data->gap_start && !data->gap_start->filename)
+ {
+ g_scanner_warn (scanner, "Gap start image options specified without filename");
+ theme_pixbuf_destroy (data->gap_start);
+ data->gap_start = NULL;
+ }
+
+ if (data->gap_end && !data->gap_end->filename)
+ {
+ g_scanner_warn (scanner, "Gap end image options specified without filename");
+ theme_pixbuf_destroy (data->gap_end);
+ data->gap_end = NULL;
+ }
+
if (token != G_TOKEN_RIGHT_CURLY)
{
/* error - cleanup for exit */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]