commit 775f2e6dbf757d1b1853337c19bf15f15a127e31
author Marco Nelissen <marcone@google.com> Mon May 09 20:54:25 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 20:54:25 2016 +0000
tree bcd0f8dc35ffe2cf79f2a62bf93e29cde8f7d180
parent 162fecdc2c98844faaa6cb43a4fbe854f511b077
parent 853702ce3d1ba5e45ce58f332ed1d40008a44375

Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9
am: 853702ce3d

* commit '853702ce3d1ba5e45ce58f332ed1d40008a44375':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I2b8f6070ecc873d67be5a4c72ca870606af93a3d

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index a24621b..172db27 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1223,7 +1223,13 @@
 
     for (int i=0 ; err==NO_ERROR && i<numFds ; i++) {
         h->data[i] = dup(readFileDescriptor());
-        if (h->data[i] < 0) err = BAD_VALUE;
+        if (h->data[i] < 0) {
+            for (int j = 0; j < i; j++) {
+                close(h->data[j]);
+            }
+            native_handle_delete(h);
+            return 0;
+        }
     }
     err = read(h->data + numFds, sizeof(int)*numInts);
     if (err != NO_ERROR) {