Fixed loading delayed imports by ordinal

Zezula Ladislav · Zezula Ladislav · commit ba7787d4ded1 · 2018-04-26T14:51:24.000+02:00
diff --git a/deps/pelib/CMakeLists.txt b/deps/pelib/CMakeLists.txt
@@ -8,8 +8,7 @@ if(CMAKE_CXX_COMPILER)
 endif()
 
 ExternalProject_Add(pelib-project
-	URL https://github.com/avast-tl/pelib/archive/574de5912f7e07e981ef079639fb003aaa7490b5.zip
-#	URL https://github.com/avast-tl/pelib/archive/19f9a34c0dd10657303e15f7a9d03de9d177e6be.zip
+	URL https://github.com/avast-tl/pelib/archive/master.zip
 	DOWNLOAD_NAME pelib.zip
 	CMAKE_ARGS
 		# This does not work on MSVC, but may be useful on Linux.
diff --git a/include/retdec/fileformat/file_format/pe/pe_template.h b/include/retdec/fileformat/file_format/pe/pe_template.h
@@ -579,7 +579,7 @@ template<int bits> bool peDelayImport(const PeLib::PeHeaderT<bits> &peHeader,
 	import.setAddress(peImageBase(peHeader) + function->address.Value);
 	import.setLibraryIndex(fileIndex);
 	import.invalidateOrdinalNumber();
-	if(library->ordinalNumbersAreValid())
+	if(library->ordinalNumbersAreValid() && function->hint != 0)
 	{
 		import.setOrdinalNumber(function->hint);
 	}

Original file line number	Diff line number	Diff line change
`@@ -579,7 +579,7 @@ template<int bits> bool peDelayImport(const PeLib::PeHeaderT<bits> &peHeader,`
`579`	`579`	`import.setAddress(peImageBase(peHeader) + function->address.Value);`
`580`	`580`	`import.setLibraryIndex(fileIndex);`
`581`	`581`	`import.invalidateOrdinalNumber();`
`582`		`- if(library->ordinalNumbersAreValid())`
	`582`	`+ if(library->ordinalNumbersAreValid() && function->hint != 0)`
`583`	`583`	`{`
`584`	`584`	`import.setOrdinalNumber(function->hint);`
`585`	`585`	`}`