gnumeric r16999 - in trunk: . src

[mortenw svn gnome org]

Author: mortenw
Date: Thu Dec 11 16:01:13 2008
New Revision: 16999
URL: http://svn.gnome.org/viewvc/gnumeric?rev=16999&view=rev

Log:
2008-12-11  Morten Welinder  <terra gnome org>

	* src/parser.y (unregister_allocation): Check the whole stack if
	we have to.  Fixes #564077.



Modified:
   trunk/ChangeLog
   trunk/src/parser.y

Modified: trunk/src/parser.y
==============================================================================
--- trunk/src/parser.y	(original)
+++ trunk/src/parser.y	Thu Dec 11 16:01:13 2008
@@ -147,7 +147,7 @@
 static void
 unregister_allocation (void const *data)
 {
-	int pos;
+	int i, pos;
 
 	/* It's handy to be able to register and unregister NULLs.  */
 	if (!data)
@@ -166,18 +166,17 @@
 	 * The first "00" is registered before the second division is
 	 * reduced.
 	 *
-	 * This isn't a big deal -- we will just look at the entry just below
+	 * Another example is 564077 where we deallocate out of order.
+	 *
+	 * This isn't a big deal -- we will just look at the entries below
 	 * the top.
 	 */
-	pos -= 2;
-	if (pos >= 0 && data == g_ptr_array_index (deallocate_stack, pos)) {
-		g_ptr_array_index (deallocate_stack, pos) =
-			g_ptr_array_index (deallocate_stack, pos + 2);
-		g_ptr_array_index (deallocate_stack, pos + 1) =
-			g_ptr_array_index (deallocate_stack, pos + 3);
-
-		g_ptr_array_set_size (deallocate_stack, pos + 2);
-		return;
+	for (i = pos - 2; i >= 0; i -= 2) {
+		if (data == g_ptr_array_index (deallocate_stack, i)) {
+			g_ptr_array_remove_index (deallocate_stack, i);
+			g_ptr_array_remove_index (deallocate_stack, i);
+			return;
+		}
 	}
 
 	g_warning ("Unbalanced allocation registration");