all repos — openbox @ 8f37a97a4cc29d35f6a632ef2f71ac760e301ee5

openbox fork - make it a bit more like ryudo 

The code to replace $wid/$pid died on $foo.

It failed to increment a variable after finding a $ but no pid or wid,
which led to a fun infinite loop. Also don't check if c[1] is w if we
already established it was p.
Mikael Magnusson mikachu@gmail.com
commit

8f37a97a4cc29d35f6a632ef2f71ac760e301ee5

parent

d81d54c7a977a034199f24fc8fa7433e634aaf91

1 files changed, 4 insertions(+), 3 deletions(-)

jump to
M openbox/actions/execute.c → openbox/actions/execute.c 
@@ -144,7 +144,7 @@ 
     if (data->client) {
         gchar *c, *before, *expand;
 
-        /* replace occurances of $pid and $wid */
+        /* replace occurrences of $pid and $wid */
 
         expand = NULL;
         before = cmd;

@@ -168,8 +168,7 @@ g_free(tmp);
 
                 before = c + 4; /* 4 = strlen("$pid") */
             }
-
-            if ((c[1] == 'w' || c[1] == 'W') &&
+            else if ((c[1] == 'w' || c[1] == 'W') &&
                 (c[2] == 'i' || c[2] == 'I') &&
                 (c[3] == 'd' || c[3] == 'D') &&
                 !g_ascii_isalnum(c[4]))

@@ -187,6 +186,8 @@ g_free(tmp);
 
                 before = c + 4; /* 4 = strlen("$wid") */
             }
+            else
+                before = c + 1; /* no infinite loops plz */
         }
 
         if (expand) {