openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

FileMap::create: remove duplicate addition. am: 54794ac613 am: 2912d9c190 

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/12393457

Change-Id: I416cdeb24824e7da9f437f61530e1861c9ea446c
This commit is contained in:
Elliott Hughes 2020-08-28 22:58:07 +00:00 committed by Automerger Merge Worker
parent d05ecb8d9d 2912d9c190
commit 98e213207f
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libutils/FileMap.cpp
View File

@ -168,12 +168,6 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le
return false;
}
#else // !defined(__MINGW32__)
int prot, flags, adjust;
off64_t adjOffset;
size_t adjLength;
void* ptr;
assert(fd >= 0);
assert(offset >= 0);
assert(length > 0);
@ -187,20 +181,19 @@ bool FileMap::create(const char* origFileName, int fd, off64_t offset, size_t le
}
}
adjust = offset % mPageSize;
adjOffset = offset - adjust;
adjLength = length + adjust;
int adjust = offset % mPageSize;
off64_t adjOffset = offset - adjust;
size_t adjLength;
if (__builtin_add_overflow(length, adjust, &adjLength)) {
ALOGE("adjusted length overflow: length %zu adjust %d", length, adjust);
return false;
}
flags = MAP_SHARED;
prot = PROT_READ;
if (!readOnly)
prot |= PROT_WRITE;
int flags = MAP_SHARED;
int prot = PROT_READ;
if (!readOnly) prot |= PROT_WRITE;
ptr = mmap(NULL, adjLength, prot, flags, fd, adjOffset);
void* ptr = mmap(nullptr, adjLength, prot, flags, fd, adjOffset);
if (ptr == MAP_FAILED) {
ALOGE("mmap(%lld,%zu) failed: %s\n",
(long long)adjOffset, adjLength, strerror(errno));