In MemoryBuffer::getOpenFile() don't verify that the mmap'ed
authorArgyrios Kyrtzidis <akyrtzi@gmail.com>
Wed, 11 Jul 2012 20:59:20 +0000 (20:59 +0000)
committerArgyrios Kyrtzidis <akyrtzi@gmail.com>
Wed, 11 Jul 2012 20:59:20 +0000 (20:59 +0000)
file buffer is null-terminated.

If the file is smaller than we thought, mmap will not allow dereferencing
past the pages that are enough to cover the actual file size,
even though we asked for a larger address range.

rdar://11612916

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160075 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Support/MemoryBuffer.cpp

index 37377061aa26a5824731050408ff2e86b17080ef..992f03c52058b9de1341fb00abd7ee9635c97e5e 100644 (file)
@@ -313,16 +313,6 @@ error_code MemoryBuffer::getOpenFile(int FD, const char *Filename,
                                                       RealMapOffset)) {
       result.reset(GetNamedBuffer<MemoryBufferMMapFile>(
           StringRef(Pages + Delta, MapSize), Filename, RequiresNullTerminator));
-
-      if (RequiresNullTerminator && result->getBufferEnd()[0] != '\0') {
-        // There could be a racing issue that resulted in the file being larger
-        // than the FileSize passed by the caller. We already have an assertion
-        // for this in MemoryBuffer::init() but have a runtime guarantee that
-        // the buffer will be null-terminated here, so do a copy that adds a
-        // null-terminator.
-        result.reset(MemoryBuffer::getMemBufferCopy(result->getBuffer(),
-                                                    Filename));
-      }
       return error_code::success();
     }
   }