Commit 107f18cb authored Jul 14, 2020 by Steven Moreland Committed by Automerger Merge Worker Jul 14, 2020

String16::remove - avoid overflow am: 4048e499

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

Change-Id: I4dedf81e3471473e589a858e14d7a9ae5f91b3d9

parents 59e7d4e8 4048e499

libutils/String16.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -402,7 +402,7 @@ status_t String16::remove(size_t len, size_t begin)
		mString = getEmptyString();
		return NO_ERROR;
		}
		if ((begin+len) > N) len = N-begin;
		if (len > N \|\| len > N - begin) len = N - begin;
		if (begin == 0 && len == N) {
		return NO_ERROR;
		}