libcore/mmap.cpp: mmap(2) returns MAP_FAILED on error (mitsuba-render…

…er#8)
gmzang · Mar 4, 2020 · f539835 · f539835
1 parent 12622b2
commit f539835
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/libcore/mmap.cpp b/src/libcore/mmap.cpp
@@ -39,8 +39,10 @@ struct MemoryMappedFile::MemoryMappedFilePrivate {
                 Throw("Could not write to \"%s\"!", filename.string());
 
             data = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-            if (data == nullptr)
+            if (data == MAP_FAILED) {
+                data = nullptr;
                 Throw("Could not map \"%s\" to memory!", filename.string());
+            }
             if (close(fd) != 0)
                 Throw("close(): unable to close file!");
         #elif defined(__WINDOWS__)
@@ -88,8 +90,10 @@ struct MemoryMappedFile::MemoryMappedFilePrivate {
                 Throw("Could not write to \"%s\"!", filename.string());
 
             data = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
-            if (data == nullptr)
+            if (data == MAP_FAILED) {
+                data = nullptr;
                 Throw("Could not map \"%s\" to memory!", filename.string());
+            }
 
             if (close(fd) != 0)
                 Throw("close(): unable to close file!");
@@ -139,8 +143,10 @@ struct MemoryMappedFile::MemoryMappedFilePrivate {
                 Throw("Could not open \"%s\"!", filename.string());
 
             data = mmap(nullptr, size, PROT_READ | (can_write ? PROT_WRITE : 0), MAP_SHARED, fd, 0);
-            if (data == nullptr)
+            if (data == MAP_FAILED) {
+                data = nullptr;
                 Throw("Could not map \"%s\" to memory!", filename.string());
+            }
 
             if (close(fd) != 0)
                 Throw("close(): unable to close file!");