diff options
| author | Steven Moreland <smoreland@google.com> | 2020-07-14 17:24:42 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-14 17:24:42 +0000 |
| commit | 80c46b05413f263a9e6fda2618e334a3ba27f64a (patch) | |
| tree | b8c2253f96aca809d15b0b698a37e2dd409f62a1 | |
| parent | 41eaad8e354c6642aef902ee5d20649e03aadfd7 (diff) | |
| parent | 8367a666b593c9619b71ba45bacde1cb36a9ae33 (diff) | |
String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b am: 26b81f59d2 am: 8367a666b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802
Change-Id: Ic25dca55b553b062edc4ced44ddef68b96428906
| -rw-r--r-- | libutils/String16.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libutils/String16.cpp b/libutils/String16.cpp index d514f29fb..70bf5a0fb 100644 --- a/libutils/String16.cpp +++ b/libutils/String16.cpp @@ -441,7 +441,7 @@ status_t String16::remove(size_t len, size_t begin) mString = getEmptyString(); return OK; } - if ((begin+len) > N) len = N-begin; + if (len > N || len > N - begin) len = N - begin; if (begin == 0 && len == N) { return OK; } |