commit 853702ce3d1ba5e45ce58f332ed1d40008a44375
author Marco Nelissen <marcone@google.com> Mon May 09 20:48:32 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 20:48:32 2016 +0000
tree ddac168e30612bbb6c260d7d98113ff48593d63b
parent 74d2c4b4c97dbbcf43a9f8870007593d61beb547
parent 275c9f60f94780bd686eca9750ec41cc1fafa333

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

* commit '275c9f60f94780bd686eca9750ec41cc1fafa333':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I6516dea7eac82d06e1ffd1d269dbb6415fece948

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 0464e93..c383a2d 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1150,7 +1150,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) {