| commit | 45bd500d2bbd73631c5c5e733ed06743f441810d | [log] [tgz] |
|---|---|---|
| author | Mike McTernan <mikemcternan@google.com> | Wed Mar 15 03:01:03 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Mar 15 03:01:03 2023 +0000 |
| tree | acefd2b22d61f7a7a425c3c3688d209f3f414830 | |
| parent | 8902a19d6ef5bb05b5389e3dc880f6969aaf4696 [diff] | |
| parent | 51d0bc9504a6f7a47910fcd82da980ef76a06fb2 [diff] |
Merge "teeui:utf8range: Fix ubsan violation on some multibyte codepoints" am: 6384fbb9fd am: 5edde22b5c am: 286ab6a3dc am: 28cff062c5 am: 51d0bc9504 Original change: https://android-review.googlesource.com/c/platform/system/teeui/+/2480157 Change-Id: Ia1510cf5d88b6c67351875b114d8e8e8d05f4965 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/libteeui/include/teeui/utf8range.h b/libteeui/include/teeui/utf8range.h index 496b903..5fe27ff 100644 --- a/libteeui/include/teeui/utf8range.h +++ b/libteeui/include/teeui/utf8range.h
@@ -61,7 +61,7 @@ return c; } else { // multi byte - unsigned long result = c & ~(0xff << (8 - byte_count)); + unsigned long result = c & ~(0xffu << (8 - byte_count)); ++begin; for (size_t i = 1; i < byte_count; ++i) { result <<= 6;