commit 82afbe2258c5c5e18ea6e9496d590cff177e67d4
author Marco Nelissen <marcone@google.com> Mon May 09 20:59:50 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 09 20:59:50 2016 +0000
tree eeb26a4c03ba5d6ab6a82f11fef9f55cc7d55162
parent 5ad8d443776e74a56e0e461ae6d333cf52e4f591
parent 775f2e6dbf757d1b1853337c19bf15f15a127e31

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

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

Change-Id: Ibfc37203a33c603df365ed9cbb85632d34acafbd

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index 87ce5d0..ba7ccfc 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1221,7 +1221,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) {