summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalev Lember <kalevlember@gmail.com>2012-02-09 15:12:22 +0200
committerKalev Lember <kalevlember@gmail.com>2012-02-09 17:58:21 +0200
commitb21dd67d60b16101c24a67c9a7e82ff22adc45a6 (patch)
tree696298b6944b9e8195b912ad2c08d657a04d456b
parentfed1cfb12293cc8995278d5657d0d49c742f416e (diff)
downloadgtk+-b21dd67d60b16101c24a67c9a7e82ff22adc45a6.tar.gz
win32: Don't crash when installed in a top-level directory
Avoid NULL-pointer dereference when package installation directory doesn't contain any slashes. Reported by Paweł Forysiuk.
-rw-r--r--gtk/gtkwin32.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkwin32.c b/gtk/gtkwin32.c
index b582942a7e..e9ba709d87 100644
--- a/gtk/gtkwin32.c
+++ b/gtk/gtkwin32.c
@@ -59,7 +59,8 @@ _gtk_get_libdir (void)
{
gchar *root = g_win32_get_package_installation_directory_of_module (gtk_dll);
gchar *slash = strrchr (root, '\\');
- if (g_ascii_strcasecmp (slash + 1, ".libs") == 0)
+ if (slash != NULL &&
+ g_ascii_strcasecmp (slash + 1, ".libs") == 0)
gtk_libdir = GTK_LIBDIR;
else
gtk_libdir = g_build_filename (root, "lib", NULL);