From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 9 Oct 2010 22:51:36 +0000 (+0200)
Subject: Fix small leak in If action option parsing
X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fopenbox;a=commitdiff_plain;h=74f7f35b59ce395c17fa823660a480dd94c6077c

Fix small leak in If action option parsing
---

diff --git a/openbox/actions/if.c b/openbox/actions/if.c
index 28010d38..0e055a98 100644
--- a/openbox/actions/if.c
+++ b/openbox/actions/if.c
@@ -98,13 +98,16 @@ static gpointer setup_func(xmlNodePtr node)
             o->decor_on = TRUE;
     }
     if ((n = obt_xml_find_node(node, "desktop"))) {
-        gchar *s = obt_xml_node_string(n);
-        if (!g_ascii_strcasecmp(s, "current"))
-            o->desktop_current = TRUE;
-        if (!g_ascii_strcasecmp(s, "other"))
-            o->desktop_other = TRUE;
-        else
-            o->desktop_number = atoi(s);
+        gchar *s;
+        if ((s = obt_xml_node_string(n))) {
+          if (!g_ascii_strcasecmp(s, "current"))
+              o->desktop_current = TRUE;
+          if (!g_ascii_strcasecmp(s, "other"))
+              o->desktop_other = TRUE;
+          else
+              o->desktop_number = atoi(s);
+          g_free(s);
+        }
     }
     if ((n = obt_xml_find_node(node, "omnipresent"))) {
         if (obt_xml_node_bool(n))