Attachment 890503 Details for Bug 1084414 – evo patch V

[patch] evo patch V

evo-leaks-2.patch (text/plain), 16.64 KB, created by Milan Crha on 2014-04-28 13:48:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Milan Crha

Created: 2014-04-28 13:48:09 UTC

Size: 16.64 KB

patch

obsolete

>Index: addressbook/gui/widgets/e-addressbook-table-adapter.c
>===================================================================
>--- addressbook/gui/widgets/e-addressbook-table-adapter.c	(revision 1)
>+++ addressbook/gui/widgets/e-addressbook-table-adapter.c	(working copy)
>@@ -148,7 +148,7 @@ addressbook_value_at (ETableModel *etc,
> 		}
> 	}
> 
>-	return (gpointer)(value ? value : "");
>+	return g_strdup (value ? value : "");
> }
> 
> /* This function sets the value at a particular point in our ETableModel. */
>Index: calendar/gui/dialogs/event-page.c
>===================================================================
>--- calendar/gui/dialogs/event-page.c	(revision 1)
>+++ calendar/gui/dialogs/event-page.c	(working copy)
>@@ -938,6 +938,7 @@ event_page_finalize (GObject *object)
> 	g_ptr_array_free (priv->deleted_attendees, TRUE);
> 
> 	g_free (priv->old_summary);
>+	g_free (priv->user_add);
> 
> 	priv->alarm_list_dlg_widget = NULL;
> 
>Index: calendar/gui/e-alarm-list.c
>===================================================================
>--- calendar/gui/e-alarm-list.c	(revision 1)
>+++ calendar/gui/e-alarm-list.c	(working copy)
>@@ -79,9 +79,22 @@ G_DEFINE_TYPE_WITH_CODE (
> 		e_alarm_list_tree_model_init))
> 
> static void
>+alarm_list_dispose (GObject *object)
>+{
>+	e_alarm_list_clear (E_ALARM_LIST (object));
>+
>+	G_OBJECT_CLASS (e_alarm_list_parent_class)->dispose (object);
>+}
>+
>+static void
> e_alarm_list_class_init (EAlarmListClass *class)
> {
>+	GObjectClass *object_class;
>+
> 	column_types[E_ALARM_LIST_COLUMN_DESCRIPTION] = G_TYPE_STRING;
>+
>+	object_class = G_OBJECT_CLASS (class);
>+	object_class->dispose = alarm_list_dispose;
> }
> 
> static void
>Index: calendar/gui/e-cal-model-calendar.c
>===================================================================
>--- calendar/gui/e-cal-model-calendar.c	(revision 1)
>+++ calendar/gui/e-cal-model-calendar.c	(working copy)
>@@ -438,8 +438,6 @@ ecmc_free_value (ETableModel *etm,
> 	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
> 	case E_CAL_MODEL_CALENDAR_FIELD_LOCATION :
> 	case E_CAL_MODEL_CALENDAR_FIELD_TRANSPARENCY :
>-		if (value)
>-			g_free (value);
> 		break;
> 	}
> }
>Index: calendar/gui/e-cal-model-tasks.c
>===================================================================
>--- calendar/gui/e-cal-model-tasks.c	(revision 1)
>+++ calendar/gui/e-cal-model-tasks.c	(working copy)
>@@ -1049,8 +1049,6 @@ ecmt_free_value (ETableModel *etm,
> 	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
> 	case E_CAL_MODEL_TASKS_FIELD_STATUS :
> 	case E_CAL_MODEL_TASKS_FIELD_URL :
>-		if (value)
>-			g_free (value);
> 		break;
> 	case E_CAL_MODEL_TASKS_FIELD_PERCENT :
> 	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
>@@ -1076,7 +1074,7 @@ ecmt_initialize_value (ETableModel *etm,
> 	case E_CAL_MODEL_TASKS_FIELD_PRIORITY :
> 	case E_CAL_MODEL_TASKS_FIELD_STATUS :
> 	case E_CAL_MODEL_TASKS_FIELD_URL :
>-		return g_strdup ("");
>+		return (gpointer) "";
> 	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
> 	case E_CAL_MODEL_TASKS_FIELD_DUE :
> 	case E_CAL_MODEL_TASKS_FIELD_COMPLETE :
>Index: calendar/gui/e-cal-model.c
>===================================================================
>--- calendar/gui/e-cal-model.c	(revision 1)
>+++ calendar/gui/e-cal-model.c	(working copy)
>@@ -701,7 +701,7 @@ cal_model_finalize (GObject *object)
> 		}
> 		g_object_unref (comp_data);
> 	}
>-	g_ptr_array_free (priv->objects, FALSE);
>+	g_ptr_array_free (priv->objects, TRUE);
> 
> 	g_mutex_clear (&priv->notify_lock);
> 
>@@ -1045,7 +1045,7 @@ get_categories (ECalModelComponent *comp_data)
> 		}
> 	}
> 
>-	return comp_data->priv->categories_str->str;
>+	return g_strdup (comp_data->priv->categories_str->str);
> }
> 
> static gchar *
>@@ -1087,24 +1087,18 @@ static gpointer
> get_description (ECalModelComponent *comp_data)
> {
> 	icalproperty *prop;
>-	static GString *str = NULL;
> 
>-	if (str) {
>-		g_string_free (str, TRUE);
>-		str = NULL;
>-	}
>-
> 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY);
> 	if (prop) {
>-		str = g_string_new (NULL);
>+		GString *str = g_string_new (NULL);
> 		do {
> 			str = g_string_append (str, icalproperty_get_description (prop));
> 		} while ((prop = icalcomponent_get_next_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY)));
> 
>-		return str->str;
>+		return g_string_free (str, FALSE);
> 	}
> 
>-	return (gpointer) "";
>+	return g_strdup ("");
> }
> 
> static ECellDateEditValue *
>@@ -1204,9 +1198,9 @@ get_summary (ECalModelComponent *comp_data)
> 
> 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY);
> 	if (prop)
>-		return (gpointer) icalproperty_get_summary (prop);
>+		return g_strdup (icalproperty_get_summary (prop));
> 
>-	return (gpointer) "";
>+	return g_strdup ("");
> }
> 
> static gchar *
>@@ -1789,8 +1783,8 @@ ecm_free_value (ETableModel *etm,
> 	case E_CAL_MODEL_FIELD_HAS_ALARMS :
> 	case E_CAL_MODEL_FIELD_ICON :
> 	case E_CAL_MODEL_FIELD_COLOR :
>+	case E_CAL_MODEL_FIELD_DTSTART:
> 		break;
>-	case E_CAL_MODEL_FIELD_DTSTART :
> 	case E_CAL_MODEL_FIELD_CREATED :
> 	case E_CAL_MODEL_FIELD_LASTMODIFIED :
> 		if (value)
>Index: calendar/gui/e-cell-date-edit-text.c
>===================================================================
>--- calendar/gui/e-cell-date-edit-text.c	(revision 1)
>+++ calendar/gui/e-cell-date-edit-text.c	(working copy)
>@@ -135,6 +135,8 @@ cell_date_edit_text_get_text (ECellText *cell,
> 
> static void
> cell_date_edit_text_free_text (ECellText *cell,
>+			       ETableModel *model,
>+			       gint col,
>                                gchar *text)
> {
> 	g_free (text);
>Index: calendar/gui/e-day-view.c
>===================================================================
>--- calendar/gui/e-day-view.c	(revision 3)
>+++ calendar/gui/e-day-view.c	(working copy)
>@@ -803,6 +803,12 @@ day_view_dispose (GObject *object)
> 		day_view->grabbed_pointer = NULL;
> 	}
> 
>+	g_free (day_view->marcus_bains_day_view_color);
>+	day_view->marcus_bains_day_view_color = NULL;
>+
>+	g_free (day_view->marcus_bains_time_bar_color);
>+	day_view->marcus_bains_time_bar_color = NULL;
>+
> 	/* Chain up to parent's dispose() method. */
> 	G_OBJECT_CLASS (e_day_view_parent_class)->dispose (object);
> }
>Index: calendar/gui/e-meeting-list-view.c
>===================================================================
>--- calendar/gui/e-meeting-list-view.c	(revision 1)
>+++ calendar/gui/e-meeting-list-view.c	(working copy)
>@@ -839,6 +839,8 @@ e_meeting_list_view_column_set_visible (EMeetingLi
> 			break;
> 		}
> 	}
>+
>+	g_list_free (cols);
> }
> 
> void
>Index: e-util/e-cell-combo.c
>===================================================================
>--- e-util/e-cell-combo.c	(revision 1)
>+++ e-util/e-cell-combo.c	(working copy)
>@@ -407,7 +407,8 @@ e_cell_combo_select_matching_item (ECellCombo *ecc
> 	if (!found)
> 		gtk_tree_selection_unselect_all (selection);
> 
>-	e_cell_text_free_text (ecell_text, cell_text);
>+	e_cell_text_free_text (ecell_text, ecv->e_table_model,
>+		ecol->col_idx, cell_text);
> }
> 
> static void
>@@ -820,7 +821,8 @@ e_cell_combo_update_cell (ECellCombo *ecc)
> 			ecol->col_idx, ecp->popup_row, text);
> 	}
> 
>-	e_cell_text_free_text (ecell_text, old_text);
>+	e_cell_text_free_text (ecell_text, ecv->e_table_model,
>+		ecol->col_idx, old_text);
> 	g_free (text);
> }
> 
>Index: e-util/e-cell-date-edit.c
>===================================================================
>--- e-util/e-cell-date-edit.c	(revision 1)
>+++ e-util/e-cell-date-edit.c	(working copy)
>@@ -564,7 +564,8 @@ e_cell_date_edit_set_popup_values (ECellDateEdit *
> 		}
> 	}
> 
>-	e_cell_text_free_text (ecell_text, cell_text);
>+	e_cell_text_free_text (ecell_text, ecv->e_table_model,
>+		ecol->col_idx, cell_text);
> }
> 
> static void
>@@ -964,7 +965,8 @@ e_cell_date_edit_update_cell (ECellDateEdit *ecde,
> 			ecol->col_idx, ecp->popup_row, NULL);
> 	}
> 
>-	e_cell_text_free_text (ecell_text, old_text);
>+	e_cell_text_free_text (ecell_text, ecv->e_table_model,
>+		ecol->col_idx, old_text);
> }
> 
> static void
>Index: e-util/e-cell-date.c
>===================================================================
>--- e-util/e-cell-date.c	(revision 1)
>+++ e-util/e-cell-date.c	(working copy)
>@@ -63,6 +63,8 @@ ecd_get_text (ECellText *cell,
> 
> static void
> ecd_free_text (ECellText *cell,
>+	       ETableModel *model,
>+	       gint col,
>                gchar *text)
> {
> 	g_free (text);
>Index: e-util/e-cell-number.c
>===================================================================
>--- e-util/e-cell-number.c	(revision 1)
>+++ e-util/e-cell-number.c	(working copy)
>@@ -50,6 +50,8 @@ ecn_get_text (ECellText *cell,
> 
> static void
> ecn_free_text (ECellText *cell,
>+	       ETableModel *model,
>+	       gint col,
>                gchar *text)
> {
> 	g_free (text);
>Index: e-util/e-cell-percent.c
>===================================================================
>--- e-util/e-cell-percent.c	(revision 1)
>+++ e-util/e-cell-percent.c	(working copy)
>@@ -63,6 +63,8 @@ ecp_get_text (ECellText *cell,
> 
> static void
> ecp_free_text (ECellText *cell,
>+	       ETableModel *model,
>+	       gint col,
>                gchar *text)
> {
> 	/* Do Nothing. */
>Index: e-util/e-cell-size.c
>===================================================================
>--- e-util/e-cell-size.c	(revision 1)
>+++ e-util/e-cell-size.c	(working copy)
>@@ -55,6 +55,8 @@ ecd_get_text (ECellText *cell,
> 
> static void
> ecd_free_text (ECellText *cell,
>+	       ETableModel *model,
>+	       gint col,
>                gchar *text)
> {
> 	g_free (text);
>Index: e-util/e-cell-text.c
>===================================================================
>--- e-util/e-cell-text.c	(revision 1)
>+++ e-util/e-cell-text.c	(working copy)
>@@ -218,8 +218,11 @@ ect_real_get_text (ECellText *cell,
> 
> static void
> ect_real_free_text (ECellText *cell,
>+		    ETableModel *model,
>+		    gint col,
>                     gchar *text)
> {
>+	e_table_model_free_value (model, col, text);
> }
> 
> /* This is the default method for setting the ETableModel value based on
>@@ -600,7 +603,7 @@ generate_layout (ECellTextView *text_view,
> 	if (row >= 0) {
> 		gchar *temp = e_cell_text_get_text (ect, ecell_view->e_table_model, model_col, row);
> 		layout = build_layout (text_view, row, temp ? temp : "?", width);
>-		e_cell_text_free_text (ect, temp);
>+		e_cell_text_free_text (ect, ecell_view->e_table_model, model_col, temp);
> 	} else
> 		layout = build_layout (text_view, row, "Mumbo Jumbo", width);
> 
>@@ -1143,7 +1146,7 @@ ect_enter_edit (ECellView *ecell_view,
> 
> 	temp = e_cell_text_get_text (ect, ecell_view->e_table_model, model_col, row);
> 	edit->old_text = g_strdup (temp);
>-	e_cell_text_free_text (ect, temp);
>+	e_cell_text_free_text (ect, ecell_view->e_table_model, model_col, temp);
> 	edit->text = g_strdup (edit->old_text);
> 
> 	if (edit->im_context) {
>@@ -1386,7 +1389,7 @@ ect_print (ECellView *ecell_view,
> 
> 	pango_font_description_free (font_des);
> 	g_object_unref (layout);
>-	e_cell_text_free_text (ect, string);
>+	e_cell_text_free_text (ect, ecell_view->e_table_model, model_col, string);
> }
> 
> static gdouble
>@@ -1942,6 +1945,8 @@ e_cell_text_get_text (ECellText *cell,
> 
> void
> e_cell_text_free_text (ECellText *cell,
>+		       ETableModel *model,
>+		       gint col,
>                        gchar *text)
> {
> 	ECellTextClass *class;
>@@ -1952,7 +1957,7 @@ e_cell_text_free_text (ECellText *cell,
> 	if (class->free_text == NULL)
> 		return;
> 
>-	class->free_text (cell, text);
>+	class->free_text (cell, model, col, text);
> }
> 
> void
>@@ -2802,7 +2807,7 @@ e_cell_text_get_text_by_view (ECellView *cell_view
> 			E_CELL_TEXT (cell_view->ecell),
> 			cell_view->e_table_model, col, row);
> 		ret = g_strdup (model_text);
>-		e_cell_text_free_text (E_CELL_TEXT (cell_view->ecell), model_text);
>+		e_cell_text_free_text (E_CELL_TEXT (cell_view->ecell), cell_view->e_table_model, col, model_text);
> 	}
> 
> 	return ret;
>Index: e-util/e-cell-text.h
>===================================================================
>--- e-util/e-cell-text.h	(revision 1)
>+++ e-util/e-cell-text.h	(working copy)
>@@ -107,6 +107,8 @@ struct _ECellTextClass {
> 						 gint col,
> 						 gint row);
> 	void		(*free_text)		(ECellText *cell,
>+						 ETableModel *model,
>+						 gint col,
> 						 gchar *text);
> 	void		(*set_value)		(ECellText *cell,
> 						 ETableModel *model,
>@@ -146,6 +148,8 @@ gchar *		e_cell_text_get_text		(ECellText *cell,
> 
> /* Frees the value returned by e_cell_text_get_text(). */
> void		e_cell_text_free_text		(ECellText *cell,
>+						 ETableModel *model,
>+						 gint col,
> 						 gchar *text);
> 
> /* Sets the ETableModel value, based on the given string. */
>Index: e-util/e-table-one.c
>===================================================================
>--- e-util/e-table-one.c	(revision 1)
>+++ e-util/e-table-one.c	(working copy)
>@@ -109,6 +109,8 @@ one_free_value (ETableModel *etm,
> 
> 	if (one->source)
> 		e_table_model_free_value (one->source, col, value);
>+	if (one->data)
>+		one->data[col] = one->source ? e_table_model_initialize_value (one->source, col) : NULL;
> }
> 
> static gpointer
>Index: e-util/e-web-view.c
>===================================================================
>--- e-util/e-web-view.c	(revision 1)
>+++ e-util/e-web-view.c	(working copy)
>@@ -1661,6 +1661,7 @@ e_web_view_init (EWebView *web_view)
> 			settings, "changed::antialiasing",
> 			G_CALLBACK (e_web_view_update_fonts), web_view);
> 		web_view->priv->aliasing_settings = settings;
>+		g_settings_schema_unref (settings_schema);
> 	}
> 
> 	e_web_view_update_fonts (web_view);
>Index: e-util/gal-a11y-e-table-item.c
>===================================================================
>--- e-util/gal-a11y-e-table-item.c	(revision 1)
>+++ e-util/gal-a11y-e-table-item.c	(working copy)
>@@ -875,9 +875,9 @@ eti_header_structure_changed (ETableHeader *eth,
> 	g_return_if_fail (cols && prev_cols && n_cols > 0);
> 
>         /* Init to ETI_HEADER_UNCHANGED. */
>-	state = g_malloc0 (sizeof (gint) * n_cols);
>-	prev_state = g_malloc0 (sizeof (gint) * prev_n_cols);
>-	reorder = g_malloc0 (sizeof (gint) * n_cols);
>+	state = g_malloc0 (sizeof (gint) * (MAX (prev_n_cols, n_cols) + 1));
>+	prev_state = g_malloc0 (sizeof (gint) * (MAX (prev_n_cols, n_cols) + 1));
>+	reorder = g_malloc0 (sizeof (gint) * (MAX (prev_n_cols, n_cols) + 1));
> 
>         /* Compare with previously saved column headers. */
> 	for (i = 0; i < n_cols && cols[i]; i++) {
>Index: e-util/gal-view-instance.c
>===================================================================
>--- e-util/gal-view-instance.c	(revision 1)
>+++ e-util/gal-view-instance.c	(working copy)
>@@ -271,7 +271,9 @@ load_current_view (GalViewInstance *instance)
> 	}
> 
> 	if (doc == NULL) {
>-		instance->current_id = g_strdup (gal_view_instance_get_default_view (instance));
>+		gchar *view_id = g_strdup (gal_view_instance_get_default_view (instance));
>+		g_free (instance->current_id);
>+		instance->current_id = view_id;
> 
> 		if (instance->current_id) {
> 			gint index = gal_view_collection_get_view_index_by_id (
>@@ -289,6 +291,7 @@ load_current_view (GalViewInstance *instance)
> 	}
> 
> 	root = xmlDocGetRootElement (doc);
>+	g_free (instance->current_id);
> 	instance->current_id = e_xml_get_string_prop_by_name_with_default (root, (const guchar *)"current_view", NULL);
> 
> 	if (instance->current_id != NULL) {
>Index: mail/message-list.c
>===================================================================
>--- mail/message-list.c	(revision 1)
>+++ mail/message-list.c	(working copy)
>@@ -1103,6 +1103,7 @@ ml_duplicate_value (ETreeModel *etm,
> 	case COL_SENT:
> 	case COL_RECEIVED:
> 	case COL_SIZE:
>+	case COL_FOLLOWUP_FLAG:
> 	case COL_FOLLOWUP_FLAG_STATUS:
> 	case COL_FOLLOWUP_DUE_BY:
> 		return (gpointer) value;
>@@ -1114,7 +1115,6 @@ ml_duplicate_value (ETreeModel *etm,
> 	case COL_RECIPIENTS:
> 	case COL_MIXED_SENDER:
> 	case COL_MIXED_RECIPIENTS:
>-	case COL_FOLLOWUP_FLAG:
> 	case COL_LOCATION:
> 	case COL_LABELS:
> 		return g_strdup (value);
>@@ -1140,19 +1140,19 @@ ml_free_value (ETreeModel *etm,
> 	case COL_SENT:
> 	case COL_RECEIVED:
> 	case COL_SIZE:
>+	case COL_FOLLOWUP_FLAG:
> 	case COL_FOLLOWUP_FLAG_STATUS:
> 	case COL_FOLLOWUP_DUE_BY:
>+	case COL_FROM:
> 	case COL_FROM_NORM:
>+	case COL_SUBJECT:
> 	case COL_SUBJECT_NORM:
>+	case COL_TO:
> 	case COL_TO_NORM:
> 	case COL_SUBJECT_TRIMMED:
> 	case COL_COLOUR:
> 		break;
> 
>-	case COL_FROM:
>-	case COL_SUBJECT:
>-	case COL_TO:
>-	case COL_FOLLOWUP_FLAG:
> 	case COL_LOCATION:
> 	case COL_SENDER:
> 	case COL_RECIPIENTS:
>@@ -1181,14 +1181,14 @@ ml_initialize_value (ETreeModel *etm,
> 	case COL_SENT:
> 	case COL_RECEIVED:
> 	case COL_SIZE:
>+	case COL_FROM:
>+	case COL_TO:
>+	case COL_FOLLOWUP_FLAG:
> 	case COL_FOLLOWUP_FLAG_STATUS:
> 	case COL_FOLLOWUP_DUE_BY:
>+	case COL_SUBJECT:
> 		return NULL;
> 
>-	case COL_FROM:
>-	case COL_SUBJECT:
>-	case COL_TO:
>-	case COL_FOLLOWUP_FLAG:
> 	case COL_LOCATION:
> 	case COL_SENDER:
> 	case COL_RECIPIENTS:
>@@ -1401,7 +1401,7 @@ sanitize_recipients (const gchar *string)
> 	gchar **name;
> 
> 	if (!string || !*string)
>-		return (gchar *) "";
>+		return g_string_free (recipients, FALSE);
> 
> 	gstring = g_string_new ("");
> 
>@@ -1765,7 +1765,7 @@ ml_tree_value_at_ex (ETreeModel *etm,
> 			return (gpointer)(res);
> 		}
> 		else
>-			return (gpointer)("");
>+			return (gpointer) g_strdup ("");
> 	}
> 	case COL_LABELS:{
> 		struct LabelsData ld;

Actions: View | Diff

Attachments on bug 1084414: 882699 | 884542 | 889221 | 889381 | 890503