| commit | ea8d38e77f143cbab19b7deca44043a3632f9ab6 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri Jul 31 19:24:50 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jul 31 19:24:50 2020 +0000 |
| tree | e7d4bee5666465188a56529614b9cce432ed2e6e | |
| parent | 4048e49956a2dfd49af3adf0f78881bf15f3550f [diff] | |
| parent | 4d14303653247da3922242796ab6d63123fbd004 [diff] |
Merge "Fail explicitly on length overflow." into oc-dev
diff --git a/libutils/String16.cpp b/libutils/String16.cpp index e8f1c51..7055fc6 100644 --- a/libutils/String16.cpp +++ b/libutils/String16.cpp
@@ -402,7 +402,7 @@ 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; }