From 18692267fb746ce07da78eedd3b389e09941ab60 Mon Sep 17 00:00:00 2001
From: Meep-Eep <Meep-Eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Sun, 24 Apr 2011 14:01:34 +0000
Subject: [PATCH] Potential crasher fix. (Never triggered in UQM atm) Also a
 small optimisation.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@3585 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/src/libs/heap/heap.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/sc2/src/libs/heap/heap.c b/sc2/src/libs/heap/heap.c
index c45d09fdf..515fc37a3 100644
--- a/sc2/src/libs/heap/heap.c
+++ b/sc2/src/libs/heap/heap.c
@@ -103,6 +103,8 @@ Heap_removeByIndex(Heap *heap, size_t i) {
 		// Restore the heap invariant. We're shifting entries into the
 		// gap that was created until we find the place where we can
 		// insert the last entry.
+		HeapValue *lastEntry = heap->entries[heap->numEntries];
+
 		for (;;) {
 			size_t childI = i * 2 + 1;
 			// The two children are childI and 'childI + 1'.
@@ -114,7 +116,7 @@ Heap_removeByIndex(Heap *heap, size_t i) {
 					// There is no left child either.
 					break;
 				}
-
+			} else {
 				if (heap->comparator(heap->entries[childI + 1],
 						heap->entries[childI]) < 0) {
 					// The right child is the child with the lowest value.
@@ -123,8 +125,7 @@ Heap_removeByIndex(Heap *heap, size_t i) {
 			}
 			// childI is now the child with the lowest value.
 
-			if (heap->comparator(heap->entries[heap->numEntries],
-					heap->entries[childI]) <= 0) {
+			if (heap->comparator(lastEntry, heap->entries[childI]) <= 0) {
 				// The last entry goes here.
 				break;
 			}
@@ -138,7 +139,7 @@ Heap_removeByIndex(Heap *heap, size_t i) {
 		}
 
 		// Fill the gap with the last entry.
-		heap->entries[i] = heap->entries[heap->numEntries];
+		heap->entries[i] = lastEntry;
 		heap->entries[i]->index = i;
 	}