Federated_Computer/federated-calendar
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

event-widget: fix memory corruption

Browse Source 
GdkRBA should not be allocated using g_new0. Used G_SLICE=debug-blocks
to find it.
This commit is contained in:
Erick Pérez Castellanos
2014-12-04 17:10:44 -05:00
parent cf96da6308
commit c2eda0e446
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gcal-event-widget.c
+4 -6
View File
@@ -209,6 +209,7 @@ gcal_event_widget_init(GcalEventWidget *self)
priv = gcal_event_widget_get_instance_private (self); priv = gcal_event_widget_get_instance_private (self);
priv->button_pressed = FALSE; priv->button_pressed = FALSE;
priv->color = NULL;
gtk_widget_set_has_window (GTK_WIDGET (self), FALSE); gtk_widget_set_has_window (GTK_WIDGET (self), FALSE);
gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE);
@@ -673,7 +674,7 @@ gcal_event_widget_new_from_data (GcalEventData *data)
ECalComponentId *id; ECalComponentId *id;
ECalComponentText e_summary; ECalComponentText e_summary;
ESourceSelectable *extension; ESourceSelectable *extension;
GdkRGBA *color; GdkRGBA color;
ECalComponentDateTime dt; ECalComponentDateTime dt;
icaltimetype *date; icaltimetype *date;
gboolean start_is_date, end_is_date; gboolean start_is_date, end_is_date;
@@ -707,14 +708,11 @@ gcal_event_widget_new_from_data (GcalEventData *data)
gcal_event_widget_set_summary (event, (gchar*) e_summary.value); gcal_event_widget_set_summary (event, (gchar*) e_summary.value);
/* color */ /* color */
color = g_new0 (GdkRGBA, 1);
extension = E_SOURCE_SELECTABLE ( extension = E_SOURCE_SELECTABLE (
e_source_get_extension (priv->source, e_source_get_extension (priv->source,
E_SOURCE_EXTENSION_CALENDAR)); E_SOURCE_EXTENSION_CALENDAR));
gdk_rgba_parse (color, e_source_selectable_get_color (extension)); gdk_rgba_parse (&color, e_source_selectable_get_color (extension));
gcal_event_widget_set_color (event, color); gcal_event_widget_set_color (event, &color);
gdk_rgba_free (color);
/* start date */ /* start date */
e_cal_component_get_dtstart (priv->component, &dt); e_cal_component_get_dtstart (priv->component, &dt);