String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802

Change-Id: Id47901d6e4247aafb9f666ba505ab966d3adefed
This commit is contained in:
Steven Moreland 2020-07-14 16:45:16 +00:00 committed by Automerger Merge Worker
commit 26b81f59d2

View file

@ -389,7 +389,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;
}