ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Support zero-length mapped files" am: 2009e32008

Browse source 
am: 747e647bd3

Change-Id: I3003c327899f0d6712f7c5723bc08dd666045b67
This commit is contained in:
Pirama Arumuga Nainar 2019-03-11 16:52:07 -07:00 • committed by android-build-merger
commit 4c88d1aec3
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
base/mapped_file.cpp
View file

@ -41,7 +41,14 @@ std::unique_ptr<MappedFile> MappedFile::FromFd(int fd, off64_t offset, size_t le
HANDLE handle =
CreateFileMapping(reinterpret_cast<HANDLE>(_get_osfhandle(fd)), nullptr,
(prot & PROT_WRITE) ? PAGE_READWRITE : PAGE_READONLY, 0, 0, nullptr);
if (handle == nullptr) return nullptr;
if (handle == nullptr) {
// http://b/119818070 "app crashes when reading asset of zero length".
// Return a MappedFile that's only valid for reading the size.
if (length == 0) {
return std::unique_ptr<MappedFile>(new MappedFile{nullptr, 0, 0, nullptr});
}
return nullptr;
}
void* base = MapViewOfFile(handle, (prot & PROT_WRITE) ? FILE_MAP_ALL_ACCESS : FILE_MAP_READ, 0,
file_offset, file_length);
if (base == nullptr) {