commit 93bf31f54d56617baf0192a451f2269ad78e6c49
author Marco Nelissen <marcone@google.com> Mon May 09 21:27:37 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 21:27:37 2016 +0000
tree 0ae9cfa8b50deedb6731d2dccd3a7976e02b0498
parent dd9012bf09405e038f2232a16a7748f64777a4aa
parent a8244873a881f18cf5cea22dc5f566dbe6394f48

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

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

Change-Id: I351dad18e1f3b1903553a8cdfacde18c64f3b6d4

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) {