Merge commit 'f25d19c0' into experimental

2 files changed, 10 insertions, 1 deletions

diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index a3a03b0..129d14a 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -1283,7 +1283,8 @@ parse_cmd_line(const char *ctl_line, GString *result) {
         if((work_string[0] != '#')) { /* ignore comments */
             GArray *a = g_array_new (TRUE, FALSE, sizeof(gchar*));
             const CommandInfo *c = parse_command_parts(work_string, a);
-            run_parsed_command(c, a, result);
+            if(c)
+                run_parsed_command(c, a, result);
             g_array_free (a, TRUE);
         }
     }
diff --git a/tests/test-command.c b/tests/test-command.c
index d07bf79..6d3d81e 100644
--- a/tests/test-command.c
+++ b/tests/test-command.c
@@ -297,6 +297,12 @@ test_last_result (void) {
     g_string_free(result, TRUE);
 }
 
+void
+test_no_such_command (void) {
+    parse_cmd_line("no-such-command", NULL);
+    /* if we didn't crash then we're ok! */
+}
+
 int
 main (int argc, char *argv[]) {
     /* set up tests */
@@ -315,6 +321,8 @@ main (int argc, char *argv[]) {
 
     g_test_add_func("/test-command/last-result",    test_last_result);
 
+    g_test_add_func("/test-command/no-such-command", test_no_such_command);
+
     /* set up uzbl */
     initialize(argc, argv);