From: Perttu Ahola <celeron55@gmail.com>
Date: Thu, 13 Aug 2015 16:02:48 +0000 (+0300)
Subject: Fix segfault caused by a8e238ed06ee8285ed4459e9deda3117419837f6
X-Git-Tag: 0.4.13~20
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=def274a583909a695580509028bd2f393b9c5cf9;p=oweals%2Fminetest.git

Fix segfault caused by a8e238ed06ee8285ed4459e9deda3117419837f6
---

diff --git a/src/map.cpp b/src/map.cpp
index 38a700e3c..76a558d43 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1499,8 +1499,8 @@ void Map::timerUpdate(float dtime, float unload_timeout, u32 max_loaded_blocks,
 		}
 		block_count_all = mapblock_queue.size();
 		// Delete old blocks, and blocks over the limit from the memory
-		while (mapblock_queue.size() > max_loaded_blocks
-				|| mapblock_queue.top().block->getUsageTimer() > unload_timeout) {
+		while (!mapblock_queue.empty() && (mapblock_queue.size() > max_loaded_blocks
+				|| mapblock_queue.top().block->getUsageTimer() > unload_timeout)) {
 			TimeOrderedMapBlock b = mapblock_queue.top();
 			mapblock_queue.pop();