Lz loader error category (avast#630)

* Added an isLoadableAnyway category for loader errors * Fixed whitespaces * Fixed whitespaces * Replaced 0/1 with false/true * Dummy commit to force test builds
seviezhou · Sep 3, 2019 · 63f03e7 · 63f03e7
1 parent a641267
commit 63f03e7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/include/retdec/fileformat/file_format/file_format.h b/include/retdec/fileformat/file_format/file_format.h
@@ -35,6 +35,7 @@ struct LoaderErrorInfo
 	std::uint32_t loaderErrorCode;               // Loader error code, cast to uint32_t
 	const char * loaderError;
 	const char * loaderErrorUserFriendly;
+	bool isLoadableAnyway;
 };
 
 /**

diff --git a/src/fileformat/file_format/pe/pe_format.cpp b/src/fileformat/file_format/pe/pe_format.cpp
@@ -556,6 +556,7 @@ void PeFormat::initLoaderErrorInfo(PeLib::LoaderError ldrError)
 		_ldrErrInfo.loaderErrorCode = static_cast<std::uint32_t>(ldrError);
 		_ldrErrInfo.loaderError = getLoaderErrorString(ldrError, false);
 		_ldrErrInfo.loaderErrorUserFriendly = getLoaderErrorString(ldrError, true);
+		_ldrErrInfo.isLoadableAnyway = getLoaderErrorLoadableAnyway(ldrError);
 	}
 }
 

diff --git a/src/fileinfo/file_presentation/getters/simple_getter/basic_plain_getter.cpp b/src/fileinfo/file_presentation/getters/simple_getter/basic_plain_getter.cpp
@@ -46,7 +46,10 @@ std::size_t BasicPlainGetter::loadInformation(std::vector<std::string> &desc, st
 
 	// Save the title for loader error (if there was a loader error detected)
 	if(loaderErrorUserFriendly != nullptr)
+	{
 		desc.push_back("Loader error             : ");
+		desc.push_back("Loadable anyway          : ");
+	}
 
 	desc.push_back("Architecture             : ");
 	desc.push_back("Endianness               : ");
@@ -65,8 +68,11 @@ std::size_t BasicPlainGetter::loadInformation(std::vector<std::string> &desc, st
 	info.push_back(fileinfo.getFileType());
 
 	// Save the text loader error
-	if(loaderErrorUserFriendly != nullptr)
+	if (loaderErrorUserFriendly != nullptr)
+	{
 		info.push_back(loaderErrorUserFriendly);
+		info.push_back(fileinfo.getLoaderErrorInfo().isLoadableAnyway ? "Yes" : "No");
+	}
 
 	info.push_back(fileinfo.getTargetArchitecture());
 	info.push_back(fileinfo.getEndianness());

diff --git a/src/fileinfo/file_presentation/json_presentation.cpp b/src/fileinfo/file_presentation/json_presentation.cpp
@@ -146,6 +146,7 @@ void JsonPresentation::presentLoaderError(Json::Value &root) const
 		loaderErrorNode["code"] = ldrErrInfo.loaderErrorCode;
 		loaderErrorNode["code_text"] = ldrErrInfo.loaderError;
 		loaderErrorNode["description"] = ldrErrInfo.loaderErrorUserFriendly;
+		loaderErrorNode["loadable_anyway"] = ldrErrInfo.isLoadableAnyway ? "true" : "false";
 
 		root["loaderError"] = loaderErrorNode;
 	}