commit 2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b
author Adam Lesinski <adamlesinski@google.com> Thu May 28 21:11:44 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 28 21:11:44 2015 +0000
tree b34e58be4744601456d6adebe655f92339e85260
parent e86f7e96a75a7bf7bfa85d52cd9f2145fe25878c
parent 861c3f56157813627467054f488ecff7d339f2b0

am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created

* commit '861c3f56157813627467054f488ecff7d339f2b0':
  Verify that the native handle was created

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index e7589b1..99c934c 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1215,6 +1215,10 @@
     if (err != NO_ERROR) return 0;
 
     native_handle* h = native_handle_create(numFds, numInts);
+    if (!h) {
+        return 0;
+    }
+
     for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
         h->data[i] = dup(readFileDescriptor());
         if (h->data[i] < 0) err = BAD_VALUE;