From 995e010dbecb9d8c5e8697d601d35968ccfaa85c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 16 Apr 2006 05:05:03 +0000 Subject: [PATCH] fix another coverity bug --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ gdk/x11/gdkwindow-x11.c | 2 +- gtk/gtkcalendar.c | 4 ++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e7a782ddb9..5a4a40346b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-04-16 Matthias Clasen + * gdk/x11/gdkwindow-x11.c (set_initial_hints ): Avoid a + possible array overrun. (Coverity) + * gtk/gtkcalendar.c (gtk_calendar_key_press): Avoid a possible array overrun. (Coverity) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e7a782ddb9..5a4a40346b 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2006-04-16 Matthias Clasen + * gdk/x11/gdkwindow-x11.c (set_initial_hints ): Avoid a + possible array overrun. (Coverity) + * gtk/gtkcalendar.c (gtk_calendar_key_press): Avoid a possible array overrun. (Coverity) diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index e747d17f55..3ad720a8cf 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -1287,7 +1287,7 @@ set_initial_hints (GdkWindow *window) Window xwindow = GDK_WINDOW_XID (window); GdkWindowObject *private; GdkToplevelX11 *toplevel; - Atom atoms[7]; + Atom atoms[9]; gint i; private = (GdkWindowObject*) window; diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c index 5c1362a4f6..6f09e02126 100644 --- a/gtk/gtkcalendar.c +++ b/gtk/gtkcalendar.c @@ -2807,11 +2807,11 @@ gtk_calendar_key_press (GtkWidget *widget, case GDK_space: row = calendar->focus_row; col = calendar->focus_col; - day = calendar->day[row][col]; - if (row > -1 && col > -1) { return_val = TRUE; + + day = calendar->day[row][col]; if (calendar->day_month[row][col] == MONTH_PREV) calendar_set_month_prev (calendar);