Merge pull request #827 from avast/bug-upx-crash-821

s3rvac · web-flow · commit d00ce6f6a187 · 2020-07-29T18:53:49.000+02:00
Fix crash on samples having corrupted PE header (#821)
diff --git a/src/cpdetect/heuristics/pe_heuristics.cpp b/src/cpdetect/heuristics/pe_heuristics.cpp
@@ -937,7 +937,7 @@ void PeHeuristics::getUpxHeuristics()
 	// format: x.xx'\0'UPX!
 	const std::size_t minPos = 5, verLen = 4;
 	pos = content.find("UPX!");
-	if (pos >= minPos && pos < 0x500 && pos < sections[0]->getOffset())
+	if (pos >= minPos && pos < 0x500 && !sections.empty() && pos < sections[0]->getOffset())
 	{
 		std::string version;
 		std::size_t num;

Original file line number	Diff line number	Diff line change
`@@ -937,7 +937,7 @@ void PeHeuristics::getUpxHeuristics()`
`937`	`937`	`// format: x.xx'\0'UPX!`
`938`	`938`	`const std::size_t minPos = 5, verLen = 4;`
`939`	`939`	`pos = content.find("UPX!");`
`940`		`- if (pos >= minPos && pos < 0x500 && pos < sections[0]->getOffset())`
	`940`	`+ if (pos >= minPos && pos < 0x500 && !sections.empty() && pos < sections[0]->getOffset())`
`941`	`941`	`{`
`942`	`942`	`std::string version;`
`943`	`943`	`std::size_t num;`