Commit 4e27b699 authored Jul 14, 2020 by Steven Moreland Committed by Automerger Merge Worker Jul 14, 2020

String16::remove - avoid overflow am: 4048e499 am: 107f18cb am: 9be245c3 am: 64fb5012

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

Change-Id: I03057c052a24f205c78ee600178d45e0cd51a3c1

parents 75b3266e 64fb5012

libutils/String16.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}