Merge branch 'master' into day_length

2015-08-09 12:04:23 +01:00
parent d86a56cbef a9200aa69a
commit d70dbda351
142 changed files with 2617 additions and 1744 deletions
--- a/src/saveload/saveload.cpp
+++ b/src/saveload/saveload.cpp
@@ -1667,9 +1667,11 @@ static void SlLoadChunk(const ChunkHandler *ch)
 		case CH_ARRAY:
 			_sl.array_index = 0;
 			ch->load_proc();
+			if (_next_offs != 0) SlErrorCorrupt("Invalid array length");
 			break;
 		case CH_SPARSE_ARRAY:
 			ch->load_proc();
+			if (_next_offs != 0) SlErrorCorrupt("Invalid array length");
 			break;
 		default:
 			if ((m & 0xF) == CH_RIFF) {