fix crash when using uri without argument

1 files changed, 4 insertions, 1 deletions

diff --git a/src/uzbl-core.c b/src/uzbl-core.c
index b2e7a7a..779f378 100644
--- a/src/uzbl-core.c
+++ b/src/uzbl-core.c
@@ -737,7 +737,8 @@ act_dump_config_as_events() {
 void
 load_uri(WebKitWebView *web_view, GArray *argv, GString *result) {
     (void) web_view; (void) result;
-    set_var_value("uri", argv_idx(argv, 0));
+    gchar * uri = argv_idx(argv, 0);
+    set_var_value("uri", uri ? uri : "");
 }
 
 /* Javascript*/
@@ -1275,6 +1276,8 @@ set_var_value(const gchar *name, gchar *val) {
     char *endp = NULL;
     char *buf = NULL;
 
+    g_assert(val != NULL);
+
     if( (c = g_hash_table_lookup(uzbl.comm.proto_var, name)) ) {
         if(!c->writeable) return FALSE;