[gtk+/gtk-2-24] Bug 634146 - Check g_win32_get_package_installation_directory_of_module() return value



commit 82310d48a8c9aedc39acc1b2bf6a89d0bb7de918
Author: Hans Breuer <hans breuer org>
Date:   Sun Mar 16 13:59:06 2014 +0100

    Bug 634146 - Check g_win32_get_package_installation_directory_of_module() return value
    
    Remaining part of patch from Joshua Element Green.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=634146

 gtk/gtkmain.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 56c92db..d6686f9 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -99,7 +99,7 @@ _gtk_get_libdir (void)
   if (gtk_libdir == NULL)
     {
       gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
-      gchar *slash = strrchr (root, '\\');
+      gchar *slash = root ? strrchr (root, '\\') : NULL;
       if (slash != NULL &&
           g_ascii_strcasecmp (slash + 1, ".libs") == 0)
        gtk_libdir = GTK_LIBDIR;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]