From: Dana Jansens <danakj@orodu.net>
Date: Fri, 14 Oct 2011 21:06:05 +0000 (-0400)
Subject: Strip leading/trailing whitespace when parsing colors and other strings (bug #4937)
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=fd9bb43059a4e106bfa07babb0eb2f93146e49b2;p=chaz%2Fopenbox

Strip leading/trailing whitespace when parsing colors and other strings (bug #4937)
---

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;