SWDEV-251091: Added null checks and empty file check in hip_module and hip_platform

Change-Id: Iad99f996dcf90ffb86f62e79bf4cbd53b35b7e3b


[ROCm/hip commit: 3c4208aa7d]
This commit is contained in:
Sourabh Betigeri
2020-10-13 01:19:47 -07:00
committed by Sourabh Betigeri
parent ff4c647424
commit f02cf67087
4 changed files with 23 additions and 4 deletions
+2 -3
View File
@@ -13,7 +13,6 @@ FatBinaryDeviceInfo::~FatBinaryDeviceInfo() {
FatBinaryInfo::FatBinaryInfo(const char* fname, const void* image)
: fdesc_(amd::Os::FDescInit()), fsize_(0), image_(image), uri_(std::string()) {
guarantee(fname || image);
if (fname != nullptr) {
fname_ = std::string(fname);
@@ -35,7 +34,7 @@ FatBinaryInfo::~FatBinaryInfo() {
guarantee(false && "Cannot close file");
}
if (!amd::Os::MemoryUnmapFile(image_, fsize_)) {
if (fsize_ && !amd::Os::MemoryUnmapFile(image_, fsize_)) {
guarantee(false && "Cannot unmap file");
}
}
@@ -82,7 +81,7 @@ hipError_t FatBinaryInfo::ExtractFatBinary(const std::vector<hip::Device*>& devi
hip_error = CodeObject::ExtractCodeObjectFromMemory(image_,
device_names, code_objs, uri_);
} else {
return hipErrorMissingConfiguration;
return hipErrorInvalidValue;
}
if (hip_error == hipErrorNoBinaryForGpu) {