diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2015-05-28 20:40:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-28 20:40:46 +0000 |
| commit | 861c3f56157813627467054f488ecff7d339f2b0 (patch) | |
| tree | 32d89eaadf1bec654e3b4414d035791463ab7ba7 /libs | |
| parent | 3c0272ba8fbb98b5f1d45c52b1ae5292a8978e7d (diff) | |
| parent | 9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0 (diff) | |
| download | frameworks_native-861c3f56157813627467054f488ecff7d339f2b0.zip frameworks_native-861c3f56157813627467054f488ecff7d339f2b0.tar.gz frameworks_native-861c3f56157813627467054f488ecff7d339f2b0.tar.bz2 | |
am 9004e7f5: am 4ff0cb44: Verify that the native handle was created
* commit '9004e7f5516c5b4a1b4178fa6a8bb4b3ca4ddcd0':
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 1dbb06f..777bc3c 100644 --- a/libs/binder/Parcel.cpp +++ b/libs/binder/Parcel.cpp @@ -1217,6 +1217,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; |