| commit | 5edde22b5c45368046c4f156944390debff5aaaa | [log] [tgz] |
|---|---|---|
| author | Mike McTernan <mikemcternan@google.com> | Tue Mar 14 23:01:58 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Mar 14 23:01:58 2023 +0000 |
| tree | acefd2b22d61f7a7a425c3c3688d209f3f414830 | |
| parent | ccc457d0bb6004a92c5177ba2806c5a7a63bcbfe [diff] | |
| parent | 6384fbb9fd8c90e5da13b2f90024043bcaf0bb22 [diff] |
Merge "teeui:utf8range: Fix ubsan violation on some multibyte codepoints" am: 6384fbb9fd Original change: https://android-review.googlesource.com/c/platform/system/teeui/+/2480157 Change-Id: Ic530f8c7b5e168b6344dc046111ef766b30d2ab8 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;