SWDEV-417691 - Error handling for MemoryMap OS calls.
Change-Id: I0a823289b274e118c8440f2d372a5216bf4ba6aa
[ROCm/clr commit: 7a10423a44]
Este commit está contenido en:
cometido por
Jaydeepkumar Patel
padre
6a7f06fd9b
commit
dcaa21376f
@@ -214,7 +214,7 @@ address Os::reserveMemory(address start, size_t size, size_t alignment, MemProt
|
||||
MAP_PRIVATE | MAP_NORESERVE | MAP_ANONYMOUS, 0, 0);
|
||||
|
||||
// check for out of memory
|
||||
if (mem == NULL) return NULL;
|
||||
if (mem == MAP_FAILED) return NULL;
|
||||
|
||||
address aligned = alignUp(mem, alignment);
|
||||
|
||||
@@ -842,7 +842,7 @@ bool Os::MemoryMapFileDesc(FileDesc fdesc, size_t fsize, size_t foffset, const v
|
||||
}
|
||||
|
||||
*mmap_ptr = mmap(NULL, fsize, PROT_READ, MAP_SHARED, fdesc, foffset);
|
||||
return true;
|
||||
return (*mmap_ptr == MAP_FAILED) ? false : true;
|
||||
}
|
||||
|
||||
bool Os::MemoryUnmapFile(const void* mmap_ptr, size_t mmap_size) {
|
||||
@@ -874,7 +874,7 @@ bool Os::MemoryMapFile(const char* fname, const void** mmap_ptr, size_t* mmap_si
|
||||
|
||||
close(fd);
|
||||
|
||||
if (*mmap_ptr == nullptr) {
|
||||
if (*mmap_ptr == MAP_FAILED) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -899,7 +899,7 @@ bool Os::MemoryMapFileTruncated(const char* fname, const void** mmap_ptr, size_t
|
||||
|
||||
close(fd);
|
||||
|
||||
if (*mmap_ptr == nullptr) {
|
||||
if (*mmap_ptr == MAP_FAILED) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -870,7 +870,7 @@ bool Os::MemoryMapFileDesc(FileDesc fdesc, size_t fsize, size_t foffset, const v
|
||||
|
||||
*mmap_ptr = MapViewOfFile(map_handle, FILE_MAP_READ, 0,0,0);
|
||||
|
||||
return true;
|
||||
return (*mmap_ptr == NULL) ? false : true;
|
||||
}
|
||||
|
||||
bool Os::MemoryUnmapFile(const void* mmap_ptr, size_t mmap_size) {
|
||||
|
||||
Referencia en una nueva incidencia
Block a user