isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 01:20:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Patch from Søren to fix some reading-from-free'd-data errors. #327575

Browse Source 
2006-01-20  Elijah Newren  <newren gmail com>

	Patch from Søren to fix some reading-from-free'd-data errors.
	#327575

	* src/edge-resistance.c (meta_display_cleanup_edges): store the
	edges in a hash table so that we can still read their values
	within the loop from the other array they are stored in, then free
	them all at the end.
This commit is contained in:
Elijah Newren 2006-01-20 22:57:42 +00:00 committed by Elijah Newren
parent e272295976
commit 5568f75cb0
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2006-01-20 Elijah Newren <newren gmail com>
Patch from Søren to fix some reading-from-free'd-data errors.
#327575
* src/edge-resistance.c (meta_display_cleanup_edges): store the
edges in a hash table so that we can still read their values
within the loop from the other array they are stored in, then free
them all at the end.
2006-01-20 Elijah Newren <newren gmail com> 2006-01-20 Elijah Newren <newren gmail com>
Fix various initialization and default issues, especially for Fix various initialization and default issues, especially for

19
src/edge-resistance.c
View File

@ -646,10 +646,13 @@ meta_display_cleanup_edges (MetaDisplay *display)
{ {
guint i,j; guint i,j;
MetaEdgeResistanceData *edge_data = display->grab_edge_resistance_data; MetaEdgeResistanceData *edge_data = display->grab_edge_resistance_data;
GHashTable *edges_to_be_freed;
g_assert (edge_data != NULL); g_assert (edge_data != NULL);
/* We first need to clean out any window edges */ /* We first need to clean out any window edges */
edges_to_be_freed = g_hash_table_new_full (g_direct_hash, g_direct_equal,
g_free, NULL);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
{ {
GArray *tmp = NULL; GArray *tmp = NULL;
@ -681,15 +684,29 @@ meta_display_cleanup_edges (MetaDisplay *display)
MetaEdge *edge = g_array_index (tmp, MetaEdge*, j); MetaEdge *edge = g_array_index (tmp, MetaEdge*, j);
if (edge->edge_type == META_EDGE_WINDOW && if (edge->edge_type == META_EDGE_WINDOW &&
edge->side_type == dir) edge->side_type == dir)
g_free (edge); {
/* The same edge will appear in two arrays, and we can't free
* it yet we still need to compare edge->side_type for the other
* array that it is in. So store it in a hash table for later
* freeing. Could also do this in a simple linked list.
*/
g_hash_table_insert (edges_to_be_freed, edge, edge);
}
} }
} }
/* Now free all the window edges (the key destroy function is g_free) */
g_hash_table_destroy (edges_to_be_freed);
/* Now free the arrays and data */ /* Now free the arrays and data */
g_array_free (edge_data->left_edges, TRUE); g_array_free (edge_data->left_edges, TRUE);
g_array_free (edge_data->right_edges, TRUE); g_array_free (edge_data->right_edges, TRUE);
g_array_free (edge_data->top_edges, TRUE); g_array_free (edge_data->top_edges, TRUE);
g_array_free (edge_data->bottom_edges, TRUE); g_array_free (edge_data->bottom_edges, TRUE);
edge_data->left_edges = NULL;
edge_data->right_edges = NULL;
edge_data->top_edges = NULL;
edge_data->bottom_edges = NULL;
/* Cleanup the timeouts */ /* Cleanup the timeouts */
if (edge_data->left_data.timeout_setup && if (edge_data->left_data.timeout_setup &&