From: kwolekr <kwolekr@minetest.net>
Date: Sun, 24 Nov 2013 07:10:15 +0000 (-0500)
Subject: Don't continue trying to deserialize blank block data
X-Git-Tag: 0.4.8~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=068dd796f51e59953d1aff9f05510847e2bfe872;p=oweals%2Fminetest.git

Don't continue trying to deserialize blank block data
---

diff --git a/src/database-leveldb.cpp b/src/database-leveldb.cpp
index ec28198b5..2a8f59c20 100644
--- a/src/database-leveldb.cpp
+++ b/src/database-leveldb.cpp
@@ -104,6 +104,7 @@ MapBlock* Database_LevelDB::loadBlock(v3s16 blockpos)
 		} else {
 			throw SerializationError("Blank block data in database");
 		}
+		return NULL;
 	}
 
 	if (s.ok()) {
diff --git a/src/database-sqlite3.cpp b/src/database-sqlite3.cpp
index 44eb86f54..38fb2ca19 100644
--- a/src/database-sqlite3.cpp
+++ b/src/database-sqlite3.cpp
@@ -237,6 +237,7 @@ MapBlock* Database_SQLite3::loadBlock(v3s16 blockpos)
 			} else {
 				throw SerializationError("Blank block data in database");
 			}
+			return NULL;
 		}
 
 		std::string datastr(data, len);