[gtk+] win32: Don't crash when installed in a top-level directory
- From: Kalev Lember <klember src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] win32: Don't crash when installed in a top-level directory
- Date: Thu, 9 Feb 2012 15:59:24 +0000 (UTC)
commit b21dd67d60b16101c24a67c9a7e82ff22adc45a6
Author: Kalev Lember <kalevlember gmail com>
Date: Thu Feb 9 15:12:22 2012 +0200
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.
gtk/gtkwin32.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/gtk/gtkwin32.c b/gtk/gtkwin32.c
index b582942..e9ba709 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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]