diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-28 21:11:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 21:11:44 +0000 |
| commit | 2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b (patch) | |
| tree | b34e58be4744601456d6adebe655f92339e85260 /libs | |
| parent | e86f7e96a75a7bf7bfa85d52cd9f2145fe25878c (diff) | |
| parent | 861c3f56157813627467054f488ecff7d339f2b0 (diff) | |
| download | frameworks_native-2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b.zip frameworks_native-2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b.tar.gz frameworks_native-2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b.tar.bz2 | |
am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
* commit '861c3f56157813627467054f488ecff7d339f2b0':
Verify that the native handle was created
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/binder/Parcel.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libs/binder/Parcel.cpp b/libs/binder/Parcel.cpp index e7589b1..99c934c 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1215,6 +1215,10 @@ native_handle* Parcel::readNativeHandle() const if (err != NO_ERROR) return 0; native_handle* h = native_handle_create(numFds, numInts); + if (!h) { + return 0; + } + for (int i=0 ; err==NO_ERROR && i<numFds ; i++) { h->data[i] = dup(readFileDescriptor()); if (h->data[i] < 0) err = BAD_VALUE; |