commit f91c66a9a889f0ed851953dd0c1b2ff70e622dda
author Marco Nelissen <marcone@google.com> Mon May 09 21:32:52 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 21:32:52 2016 +0000
tree b517ab2fb0484c9f635fcf01f54c75efbeab532f
parent d2ebf374732d6824fffc69fcffe9395b5a4a842c
parent 93bf31f54d56617baf0192a451f2269ad78e6c49

Correctly handle dup() failure in Parcel::readNativeHandle am: 1de7966c72 am: 275c9f60f9 am: 853702ce3d am: 775f2e6dbf am: 82afbe2258 am: c2c470c700 am: 56dea28189 am: bca20d8376 am: a8244873a8
am: 93bf31f54d

* commit '93bf31f54d56617baf0192a451f2269ad78e6c49':
  Correctly handle dup() failure in Parcel::readNativeHandle

Change-Id: I436ae48cf652ac717ea74e2eff8a92359562e413

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 1429a5c..d40b09c 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1385,7 +1385,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) {