commit 861c3f56157813627467054f488ecff7d339f2b0
author Adam Lesinski <adamlesinski@google.com> Thu May 28 20:40:46 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu May 28 20:40:46 2015 +0000
tree 32d89eaadf1bec654e3b4414d035791463ab7ba7
parent 3c0272ba8fbb98b5f1d45c52b1ae5292a8978e7d
parent 9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0

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

* commit '9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0':
  Verify that the native handle was created

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 1dbb06f..777bc3c 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1217,6 +1217,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;