Added check for section alignment

avast · May 23, 2020 · 718faf1 · 718faf1
1 parent 39375e3
commit 718faf1
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/include/retdec/pelib/PeFile.h b/include/retdec/pelib/PeFile.h
@@ -748,13 +748,17 @@ namespace PeLib
 		// The file size must be greater or equal to SizeOfImage
 		if(ulFileSize >= sizeOfImage)
 		{
+			dword sectionAlignment = peHeader().getSectionAlignment();
+			dword fileAlignment = peHeader().getFileAlignment();
+			dword sizeOfHeaders = peHeader().getSizeOfHeaders();
+
 			// SectionAlignment must be greater than file alignment
-			if(peHeader().getSectionAlignment() > peHeader().getFileAlignment())
+			if(sectionAlignment >= PELIB_PAGE_SIZE && sectionAlignment > fileAlignment)
 			{
 				// SizeOfHeaders must be smaller than SectionAlignment
-				if(peHeader().getSizeOfHeaders() < peHeader().getSectionAlignment())
+				if(sizeOfHeaders < sectionAlignment)
 				{
-					std::size_t headerDataSize = peHeader().getSectionAlignment() - peHeader().getSizeOfHeaders();
+					std::size_t headerDataSize = sectionAlignment - sizeOfHeaders;
 
 					// Read the entire after-header-data
 					std::vector<unsigned char> headerData(headerDataSize);