1 files changed, 3 insertions, 1 deletions
diff --git a/libxo/libxo.c b/libxo/libxo.c
index 09d2bd827f93..14268d1b250e 100644
--- a/libxo/libxo.c
+++ b/libxo/libxo.c
@@ -8104,12 +8104,14 @@ xo_parse_args (int argc, char **argv)
     cp = strrchr(xo_program, '/');
     if (cp)
 	xo_program = ++cp;
+    else
+	cp = argv[0];		/* Reset to front of string */
 
     /* GNU tools add an annoying ".test" as the program extension; remove it */
     size_t len = strlen(xo_program);
     static const char gnu_ext[] = ".test";
     if (len >= sizeof(gnu_ext)) {
-	cp = &cp[len + 1 - sizeof(gnu_ext)];
+	cp += len + 1 - sizeof(gnu_ext);
 	if (xo_streq(cp, gnu_ext))
 	    *cp = '\0';
     }