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

Merge "Judge mmap failed by MAP_FAILED instead of NULL"

Browse source
This commit is contained in:
Elliott Hughes 2014-05-22 16:23:20 +00:00 • committed by Gerrit Code Review
commit 48ac3d1b14
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fastbootd/transport.c
View file

@ -55,7 +55,7 @@ int transport_handle_download(struct transport_handle *thandle, size_t len)
ftruncate(fd, len); ftruncate(fd, len);
buffer = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); buffer = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
if (buffer == NULL) { if (buffer == MAP_FAILED) {
D(ERR, "mmap(%zu) failed: %d %s", len, errno, strerror(errno)); D(ERR, "mmap(%zu) failed: %d %s", len, errno, strerror(errno));
goto err; goto err;
} }

2
libpixelflinger/codeflinger/CodeCache.cpp
View file

@ -89,7 +89,7 @@ static mspace getMspace()
gExecutableStore = mmap(NULL, kMaxCodeCacheCapacity, gExecutableStore = mmap(NULL, kMaxCodeCacheCapacity,
PROT_READ | PROT_WRITE | PROT_EXEC, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE, fd, 0); MAP_PRIVATE, fd, 0);
LOG_ALWAYS_FATAL_IF(gExecutableStore == NULL, LOG_ALWAYS_FATAL_IF(gExecutableStore == MAP_FAILED,
"Creating code cache, mmap failed with error " "Creating code cache, mmap failed with error "
"'%s'", strerror(errno)); "'%s'", strerror(errno));
close(fd); close(fd);