From: Christian Dywan <christian@twotoasts.de>
Date: Tue, 13 Sep 2011 23:56:03 +0000 (+0200)
Subject: Check that extension_path exists before opening it
X-Git-Url: https://spindle.queued.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e55a0a91cb18b94e7ce8f0ce75793c45901ea3ec;p=midori

Check that extension_path exists before opening it
---

diff --git a/midori/main.c b/midori/main.c
index 99230d02..0230e49a 100644
--- a/midori/main.c
+++ b/midori/main.c
@@ -1212,11 +1212,12 @@ midori_load_extensions (gpointer data)
     if (g_module_supported ())
     {
         gchar* extension_path;
-        GDir* extension_dir;
+        GDir* extension_dir = NULL;
 
         if (!(extension_path = g_strdup (g_getenv ("MIDORI_EXTENSION_PATH"))))
             extension_path = sokoke_find_lib_path (PACKAGE_NAME);
-        extension_dir = g_dir_open (extension_path, 0, NULL);
+        if (extension_path != NULL)
+            extension_dir = g_dir_open (extension_path, 0, NULL);
         if (extension_dir != NULL)
         {
             const gchar* filename;