AURORA: Check kGFF4G2DAColumnType fields in GDA files for consistency

xoreos · Nov 18, 2016 · e86ab25 · e86ab25
1 parent ea15b5a
commit e86ab25
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/aurora/gdafile.cpp b/src/aurora/gdafile.cpp
@@ -213,8 +213,24 @@ GDAFile::Type GDAFile::identifyType(const Columns &columns, const Row &rows, siz
 	if (!columns || (column >= columns->size()) || !(*columns)[column])
 		return kTypeEmpty;
 
-	if ((*columns)[column]->hasField(kGFF4G2DAColumnType))
-		return (Type) (*columns)[column]->getUint(kGFF4G2DAColumnType, -1);
+	if ((*columns)[column]->hasField(kGFF4G2DAColumnType)) {
+		const Type type = (Type) (*columns)[column]->getUint(kGFF4G2DAColumnType, -1);
+
+		switch (type) {
+			case kTypeEmpty:
+			case kTypeString:
+			case kTypeInt:
+			case kTypeFloat:
+			case kTypeBool:
+			case kTypeResource:
+				break;
+
+			default:
+				throw Common::Exception("Invalid GDA column type %d", (int) type);
+		}
+
+		return type;
+	}
 
 	if (!rows || rows->empty() || !(*rows)[0])
 		return kTypeEmpty;