diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-28 21:44:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 21:44:36 +0000 |
| commit | 8728c390476110857dd6b290dac3bfdf13b33e81 (patch) | |
| tree | 6df88ae0659c7999711c2c5b383ae5dc8664b416 | |
| parent | 2cc42f0bb3db6ff63fec4cbc282fa8af33d82fca (diff) | |
| parent | 2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b (diff) | |
| download | frameworks_native-8728c390476110857dd6b290dac3bfdf13b33e81.zip frameworks_native-8728c390476110857dd6b290dac3bfdf13b33e81.tar.gz frameworks_native-8728c390476110857dd6b290dac3bfdf13b33e81.tar.bz2 | |
am 2c4f5fde: am 861c3f56: am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
* commit '2c4f5fdeca8e7a6f672bbcb8c25e6b81bf4eaa5b':
Verify that the native handle was created
| -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; |