don't segfault when toggling a nonexistent variable

2 files changed, 11 insertions, 0 deletions

diff --git a/src/commands.c b/src/commands.c
index 708ed49..2e60233 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -177,6 +177,11 @@ toggle_var(WebKitWebView *page, GArray *argv, GString *result) {
 
     uzbl_cmdprop *c = get_var_c(var_name);
 
+    if(!c) {
+        set_var_value(var_name, argv_idx(argv, 1));
+        return;
+    }
+
     switch(c->type) {
     case TYPE_STR:
     {
diff --git a/tests/test-command.c b/tests/test-command.c
index b3c3d0c..2d91b64 100644
--- a/tests/test-command.c
+++ b/tests/test-command.c
@@ -351,6 +351,12 @@ test_toggle_string (void) {
     // and wrap to the first value when it reaches the end.
     parse_cmd_line("toggle useragent 'x' 'y'", NULL);
     g_assert_cmpstr("x", ==, uzbl.net.useragent);
+
+    // user-defined variables can be toggled too.
+    parse_cmd_line("toggle new_variable 'x' 'y'", NULL);
+    gchar *value = get_var_value_string("new_variable");
+    g_assert_cmpstr("x", ==, value);
+    g_free(value);
 }
 
 int