String16::remove - avoid overflow
Bug: 156999009
Test: libutils_test (cases added)
Change-Id: Iad46d95d9848928ba81000090b2fe9aec1e5eaac
Merged-In: Iad46d95d9848928ba81000090b2fe9aec1e5eaac
(cherry picked from commit f251c1c581
)
(cherry picked from commit 9a9c8910e9296c9dc8d79c37f589895f5a2a836c)
This commit is contained in:
parent
e62a9d7669
commit
4048e49956
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue