[evolution/gnome-3-10] Bug #640382 - Prevent a crash in e_week_view_on_text_item_event()
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution/gnome-3-10] Bug #640382 - Prevent a crash in e_week_view_on_text_item_event()
- Date: Thu, 17 Oct 2013 09:24:28 +0000 (UTC)
commit 12e27454e54ab2b548410d4164c9f4a3fff795a8
Author: Milan Crha <mcrha redhat com>
Date: Thu Oct 17 11:22:29 2013 +0200
Bug #640382 - Prevent a crash in e_week_view_on_text_item_event()
calendar/gui/e-week-view.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 3751e64..92fca66 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -3290,6 +3290,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
if (view->editing_event_num == -1) {
ECalendarViewEventData *data;
+ g_return_val_if_fail (pevent != NULL, FALSE);
data = g_malloc (sizeof (ECalendarViewEventData));
pevent->x = ((GdkEventCrossing *) event)->x_root;
@@ -3311,6 +3312,8 @@ tooltip_event_cb (GnomeCanvasItem *item,
return FALSE;
}
case GDK_MOTION_NOTIFY:
+ g_return_val_if_fail (pevent != NULL, FALSE);
+
pevent->x = ((GdkEventMotion *) event)->x_root;
pevent->y = ((GdkEventMotion *) event)->y_root;
pevent->tooltip = (GtkWidget *) g_object_get_data (G_OBJECT (view), "tooltip-window");
@@ -3964,6 +3967,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
g_object_set_data ((GObject *) item, "event-num", GINT_TO_POINTER (nevent));
pevent = tooltip_get_view_event (week_view, -1, nevent);
+ g_return_val_if_fail (pevent != NULL, FALSE);
data = g_malloc (sizeof (ECalendarViewEventData));
@@ -3991,6 +3995,8 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
return FALSE;
case GDK_MOTION_NOTIFY:
+ g_return_val_if_fail (pevent != NULL, FALSE);
+
gdk_event_get_root_coords (
gdk_event, &event_x_root, &event_y_root);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]