summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2006-04-16 05:05:03 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-04-16 05:05:03 +0000
commit995e010dbecb9d8c5e8697d601d35968ccfaa85c (patch)
tree05bdd07e040af9dab3650c9bdc89a53fdf61d8ce
parent97327de395ecf438c8c87ef1cda3369f7abeb359 (diff)
downloadgdk-pixbuf-995e010dbecb9d8c5e8697d601d35968ccfaa85c.tar.gz
fix another coverity bug
-rw-r--r--ChangeLog3
-rw-r--r--ChangeLog.pre-2-103
-rw-r--r--gdk/x11/gdkwindow-x11.c2
-rw-r--r--gtk/gtkcalendar.c4
4 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e7a782ddb..5a4a40346 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-04-16 Matthias Clasen <mclasen@redhat.com>
+ * 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 e7a782ddb..5a4a40346 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
2006-04-16 Matthias Clasen <mclasen@redhat.com>
+ * 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 e747d17f5..3ad720a8c 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 5c1362a4f..6f09e0212 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);