commit 9ea09757fa63ad2a9bea9c846b51c1210d69c79f
author Narayan Kamath <narayan@google.com> Wed Oct 08 17:35:45 2014 +0100
committer Narayan Kamath <narayan@google.com> Wed Oct 08 17:37:38 2014 +0100
tree f38be59a3fb4c0d08c2df0e2f815c1b63874219d
parent 7830ef3dd0ff3749d974c2dd85a8fa59dc47aeca

Fix broken error check in Parcel::readBlob

mmap returns MAP_FAILED (which is -1) and not NULL on
failure.

Diagnosed by cferris.

bug: 17909809

Change-Id: I609788ebf94742ef88af002d2d3f3bc9b9e520ac

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index f61eaca..1dbb06f 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1281,7 +1281,7 @@
     if (fd == int(BAD_TYPE)) return BAD_VALUE;
 
     void* ptr = ::mmap(NULL, len, PROT_READ, MAP_SHARED, fd, 0);
-    if (!ptr) return NO_MEMORY;
+    if (ptr == MAP_FAILED) return NO_MEMORY;
 
     outBlob->init(true /*mapped*/, ptr, len);
     return NO_ERROR;