| commit | 71d373aebc23b7a9750c8f90c63b9821354299ee | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Jul 14 15:37:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 14 15:37:25 2020 +0000 |
| tree | a98bdf20a1890d04c08e7e353aa6554687e4f71c | |
| parent | 3ca7617b89573d7f8dbaa9b933e1540cb8ce47b7 [diff] | |
| parent | 3b0abc441bac16d0bfdee5e798a4fcf793b9ee70 [diff] |
String16::remove - avoid overflow am: 4048e49956 Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802 Change-Id: I4dedf81e3471473e589a858e14d7a9ae5f91b3d9
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; }