| commit | 30a74852b0d83c3e03d61dc5b9a017abcf183320 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 30 21:21:49 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 30 21:21:49 2020 +0000 |
| tree | 6883ea0e3fcc08ff8c77e0c71d13570932143a2f | |
| parent | 4e27b6992b696d72a81f62178d2be44797ef377a [diff] | |
| parent | f846413e621d7245d8e78f04349a6a93d2bbbea4 [diff] |
Merge "Fail explicitly on length overflow." into qt-dev
diff --git a/libutils/String16.cpp b/libutils/String16.cpp index 818b171..caab1bd 100644 --- a/libutils/String16.cpp +++ b/libutils/String16.cpp
@@ -389,7 +389,7 @@ 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; }