diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-28 20:26:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 20:26:02 +0000 |
| commit | 9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0 (patch) | |
| tree | e8e2ade107e795a8d54727dd6cda6c96f0093d6e /libs | |
| parent | dc2d031a7ee05725ad3d8cab4887d6c7a4063967 (diff) | |
| parent | 4ff0cb4404db31576cd8a81ca5ef3b044d492904 (diff) | |
| download | frameworks_native-9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0.zip frameworks_native-9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0.tar.gz frameworks_native-9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0.tar.bz2 | |
am 4ff0cb44: Verify that the native handle was created
* commit '4ff0cb4404db31576cd8a81ca5ef3b044d492904':
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 db9e0a1..e5a2871 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1144,6 +1144,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; |