| commit | 3e8e1e9011779152beeba13aa9afa2e8a1f33988 | [log] [tgz] |
|---|---|---|
| author | TreeHugger Robot <treehugger-gerrit@google.com> | Thu Jul 30 21:34:33 2020 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Thu Jul 30 21:34:33 2020 +0000 |
| tree | 5074b41ddd0c93b1023cd8832bd0db2942b06106 | |
| parent | 26b81f59d2e340d950faac120daedf47364c7e33 [diff] | |
| parent | 40f657b9f4b1053b0a04034f36a3dc1a89c3451a [diff] |
Merge "Fail explicitly on length overflow." into qt-qpr1-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; }