fileformat/format_detection: fix #431, if raw mode specified, force it.

avast · Mar 4, 2019 · a95fd46 · a95fd46
1 parent a6a951f
commit a95fd46
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/fileformat/utils/format_detection.cpp b/src/fileformat/utils/format_detection.cpp
@@ -210,6 +210,11 @@ bool isStrangeFeedface(std::istream& stream)
 
 Format detectFileFormat(std::istream &inputStream, bool isRaw)
 {
+	if (isRaw)
+	{
+		return Format::RAW_DATA;
+	}
+
 	resetStream(inputStream);
 
 	std::size_t magicSize = 0;
@@ -266,10 +271,6 @@ Format detectFileFormat(std::istream &inputStream, bool isRaw)
 	{
 		return Format::COFF;
 	}
-	else if(isRaw)
-	{
-		return Format::RAW_DATA;
-	}
 
 	return Format::UNKNOWN;
 }