commit cdea85e9a347e9c6d159b191cf1d121ae107f956
author Jeff Sharkey <jsharkey@google.com> Wed May 11 03:41:25 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 11 03:41:25 2016 +0000
tree 7a5ec56080bbc116c5668c3909a6c49a4bc9c680
parent 128074fcb90148b40ed45bba6e650cfc2eb1f1ad
parent 51c94495be151c1da03c8266592ed33f253d4b48

Merge "Move both CE/DE storage areas to adopted storage." into nyc-dev

libs/binder/Parcel.cpp

diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp
index a0161b3..c7e8ff2 100644
--- a/libs/binder/Parcel.cpp
+++ b/libs/binder/Parcel.cpp
@@ -1964,7 +1964,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) {