brasero r1484 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Thu Nov  6 20:00:00 2008
New Revision: 1484
URL: http://svn.gnome.org/viewvc/brasero?rev=1484&view=rev

Log:
	Fix a problem with accessibility enabled (gail) that triggered a loop
	in libgail and then an exhaustion of memory
	Probably bug #552811 â crash after delete used directory (comment #10)

	* src/brasero-data-tree-model.c
	(brasero_data_tree_model_node_index),
	(brasero_data_tree_model_node_to_path),
	(brasero_data_tree_model_get_path):


Modified:
   trunk/ChangeLog
   trunk/src/brasero-data-tree-model.c

Modified: trunk/src/brasero-data-tree-model.c
==============================================================================
--- trunk/src/brasero-data-tree-model.c	(original)
+++ trunk/src/brasero-data-tree-model.c	Thu Nov  6 20:00:00 2008
@@ -659,13 +659,13 @@
 	parent = node->parent;
 	for (peers = BRASERO_FILE_NODE_CHILDREN (parent); peers; peers = peers->next) {
 		if (peers == node)
-			break;
+			return pos;
 		if (!peers->is_visible)
 			continue;
 		pos ++;
 	}
 
-	return pos;
+	return -1;
 }
 
 GtkTreePath *
@@ -682,6 +682,11 @@
 		guint nth;
 
 		nth = brasero_data_tree_model_node_index (node);
+		if (nth == -1) {
+			gtk_tree_path_free (path);
+			return NULL;
+		}
+
 		gtk_tree_path_prepend_index (path, nth);
 	}
 
@@ -703,6 +708,8 @@
 	g_return_val_if_fail (iter->user_data != NULL, NULL);
 
 	node = iter->user_data;
+	if (!node->is_visible)
+		return NULL;
 
 	/* NOTE: there is only one single node without a name: root */
 	path = brasero_data_tree_model_node_to_path (BRASERO_DATA_TREE_MODEL (model), node);