From fd9bb43059a4e106bfa07babb0eb2f93146e49b2 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 14 Oct 2011 17:06:05 -0400 Subject: [PATCH] Strip leading/trailing whitespace when parsing colors and other strings (bug #4937) --- obrender/theme.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/obrender/theme.c b/obrender/theme.c index 7de9e19c..b20182ad 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -1797,6 +1797,7 @@ static gboolean read_string(XrmDatabase db, const gchar *rname, gchar **value) if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { + g_strstrip(retvalue.addr); *value = retvalue.addr; ret = TRUE; } @@ -1815,7 +1816,12 @@ static gboolean read_color(XrmDatabase db, const RrInstance *inst, if (XrmGetResource(db, rname, rclass, &rettype, &retvalue) && retvalue.addr != NULL) { - RrColor *c = RrColorParse(inst, retvalue.addr); + RrColor *c; + + /* retvalue.addr is inside the xrdb database so we can't destroy it + but we can edit it in place, as g_strstrip does. */ + g_strstrip(retvalue.addr); + c = RrColorParse(inst, retvalue.addr); if (c != NULL) { *value = c; ret = TRUE; -- 2.45.2