summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2007-06-05 15:53:41 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2007-06-05 15:53:41 +0000
commit3047c1fcf2c25cae34835435a1fdc3c24ffa661c (patch)
treed33b0d32e962d9a53ed0a486b6372f9dc5ff0373
parent2105398a55fbb4c96d386dc327107a05e374b99e (diff)
downloadgdk-pixbuf-3047c1fcf2c25cae34835435a1fdc3c24ffa661c.tar.gz
Check that window_private is not NULL before using it. (#444351, David
2007-06-05 Matthias Clasen <mclasen@redhat.com> * gdk/x11/gdkevents-x11.c (gdk_event_translate): Check that window_private is not NULL before using it. (#444351, David Ronis) svn path=/trunk/; revision=18043
-rw-r--r--ChangeLog5
-rw-r--r--gdk/x11/gdkevents-x11.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1cbc70482..8e9c453d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-05 Matthias Clasen <mclasen@redhat.com>
+
+ * gdk/x11/gdkevents-x11.c (gdk_event_translate): Check that
+ window_private is not NULL before using it. (#444351, David Ronis)
+
2007-06-05 Jakub Steiner <jimmac@ximian.com>
* gtk/stock-icons/{16,24}/gtk-find*: drop the paper sheet.
diff --git a/gdk/x11/gdkevents-x11.c b/gdk/x11/gdkevents-x11.c
index b9560d46e..5c95de7df 100644
--- a/gdk/x11/gdkevents-x11.c
+++ b/gdk/x11/gdkevents-x11.c
@@ -2102,7 +2102,7 @@ gdk_event_translate (GdkDisplay *display,
else
#endif
#if defined(HAVE_XCOMPOSITE) && defined (HAVE_XDAMAGE) && defined (HAVE_XFIXES)
- if (display_x11->have_xdamage && window_private->composited &&
+ if (display_x11->have_xdamage && window_private && window_private->composited &&
xevent->type == display_x11->xdamage_event_base + XDamageNotify)
{
XDamageNotifyEvent *damage_event = (XDamageNotifyEvent *) xevent;