| commit | 1147253d8408679b915a1007137547772d50e47a | [log] [tgz] |
|---|---|---|
| author | Steven Moreland <smoreland@google.com> | Tue Jul 14 16:45:16 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jul 14 16:45:16 2020 +0000 |
| tree | 513429ea83e70d9bf34982f2f30fd74c8edad034 | |
| parent | fb6b541b9fb843a21a7536c48d258bcd93fa18c9 [diff] | |
| parent | 907bc6c81d65311430f0facbaab7f016499bfaa0 [diff] |
String16::remove - avoid overflow am: 4048e49956 am: 107f18cb61 am: 9be245c3f0 am: 64fb5012b8 am: 4e27b6992b Original change: https://googleplex-android-review.googlesource.com/c/platform/system/core/+/11619802 Change-Id: Id47901d6e4247aafb9f666ba505ab966d3adefed
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; }