From a6444561cb21197a38277a144672cace471b6cf6 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 22 Dec 2003 20:43:37 +0000 Subject: [PATCH] 2003-12-22 Thomas Fitzsimmons * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Don't dereference NULL focus_obj_ptr. From-SVN: r74948 --- libjava/ChangeLog | 5 +++++ libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4b9ccbbddd0..a11ad98f40c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2003-12-22 Thomas Fitzsimmons + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c + (pre_event_handler): Don't dereference NULL focus_obj_ptr. + 2003-12-21 Michael Koch * javax/print/attribute/AttributeSetUtilities.java, diff --git a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c index b158e62c52d..aa9fd17b12f 100644 --- a/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c +++ b/libjava/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c @@ -1043,7 +1043,7 @@ pre_event_handler (GtkWidget *widget, GdkEvent *event, jobject peer) /* A widget with a grab will get key events */ if (!GTK_IS_WINDOW (widget)) - *focus_obj_ptr = peer; + focus_obj_ptr = &peer; else { GtkWindow *window;