diff options
| author | Steven Moreland <smoreland@google.com> | 2019-05-17 13:11:30 -0700 |
|---|---|---|
| committer | Nikoli Cartagena <dargeren@google.com> | 2019-06-10 15:55:27 -0700 |
| commit | 3b82196284ea11b8374bfea6afb027617043d6e6 (patch) | |
| tree | 4b2e0e7e05b8d73f2fcf2725a3f734c28bdc82f0 | |
| parent | c15730496d9d412871dc3a9b11524e49f3f222b0 (diff) | |
| download | platform_system_libhwbinder-security-pi-release.tar.gz platform_system_libhwbinder-security-pi-release.tar.bz2 platform_system_libhwbinder-security-pi-release.zip | |
readCString: no ubsan sub-overflowandroid-9.0.0_r60android-9.0.0_r59android-9.0.0_r58android-9.0.0_r57android-9.0.0_r56android-9.0.0_r55android-9.0.0_r54android-9.0.0_r53android-9.0.0_r52android-9.0.0_r51android-9.0.0_r50android-9.0.0_r49android-9.0.0_r48security-pi-releasepie-security-release
Bug: 132650049
Test: fuzzer
Change-Id: I1f6dcad6906951ab505a7500573b74b210a68705
Merged-In: I1f6dcad6906951ab505a7500573b74b210a68705
(cherry picked from commit 1086548c6ceb141e2852d2690db8386911a014dd)
| -rw-r--r-- | Parcel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1332,8 +1332,8 @@ bool Parcel::readBool() const const char* Parcel::readCString() const { - const size_t avail = mDataSize-mDataPos; - if (avail > 0) { + if (mDataPos < mDataSize) { + const size_t avail = mDataSize-mDataPos; const char* str = reinterpret_cast<const char*>(mData+mDataPos); // is the string's trailing NUL within the parcel's valid bounds? const char* eos = reinterpret_cast<const char*>(memchr(str, 0, avail)); |