takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

invalid color will segfault get_config_cairo_color

This commit is contained in:
Simon Gomizelj 2012-11-14 02:25:08 -05:00
parent 90d1e0f111
commit 953017068d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
termite.cc
View File

@ -911,20 +911,20 @@ static bool get_config_color(GKeyFile *config, const char *section, const char *
} }
maybe<cairo_pattern_t *> get_config_cairo_color(GKeyFile *config, const char *group, const char *key) { maybe<cairo_pattern_t *> get_config_cairo_color(GKeyFile *config, const char *group, const char *key) {
maybe<cairo_pattern_t *> ret = {};
if (auto s = get_config_string(config, group, key)) { if (auto s = get_config_string(config, group, key)) {
GdkColor color; GdkColor color;
bool success = gdk_color_parse(*s, &color); if (gdk_color_parse(*s, &color)) {
g_free(*s); ret = cairo_pattern_create_rgb(color.red / 65535.0,
if (success) {
return cairo_pattern_create_rgb(color.red / 65535.0,
color.green / 65535.0, color.green / 65535.0,
color.blue / 65535.0); color.blue / 65535.0);
} else { } else {
g_printerr("invalid color string: %s\n", *s); g_printerr("invalid color string: %s\n", *s);
} }
g_free(*s);
} }
return {}; return ret;
} }
static void load_theme(VteTerminal *vte, GKeyFile *config) { static void load_theme(VteTerminal *vte, GKeyFile *config) {