| commit | 534e740a0edba581edcee2a2986e485bc6aaa4bc | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Jul 14 17:51:44 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 14 17:51:44 2020 +0000 |
| tree | bea9e1ebb85e8d0bf03c938329cc550a408b5080 | |
| parent | a4b7be8231a4109909c09cd6578f2866a8ddab3b [diff] | |
| parent | 6890fad5a9b65adb9becf863305290ad5c6a3c4f [diff] |
String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b am: 26b81f59d2 am: 8367a666b5 am: bd6ac4c32c Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802 Change-Id: I681004c35195b47f0efa30b3cc73c6faeb2467ed
diff --git a/libutils/String16.cpp b/libutils/String16.cpp index e2a8c59..539953a 100644 --- a/libutils/String16.cpp +++ b/libutils/String16.cpp
@@ -454,7 +454,7 @@ 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; }