diff options
| author |  Mike Reed <reed@google.com> | 2017-12-21 13:34:24 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-21 21:06:44 +0000 |
| commit | 889d521d8715f4934accb630097bc09bf7ad1a32 (patch) | |
| tree | 6e41a72f078156cf8e5338ebd5165df191ab97fd /src/core/SkFont.cpp | |
| parent | 8957a1058e3937bc22192837d2fe87c4a8a047b7 (diff) | |
validate text during deserialization
Bug: 796473
Change-Id: I7b6a6c698a5b53c915ef6564852fa51ce7410a3e
Reviewed-on: https://skia-review.googlesource.com/88520
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/core/SkFont.cpp')
| -rw-r--r-- | src/core/SkFont.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/SkFont.cpp b/src/core/SkFont.cpp index aa7fe366c8..ca6cdb13b0 100644 --- a/src/core/SkFont.cpp +++ b/src/core/SkFont.cpp @@ -69,7 +69,7 @@ int SkFont::textToGlyphs(const void* text, size_t byteLength, SkTextEncoding enc count = SkUTF8_CountUnichars((const char*)text, byteLength); break; case kUTF16_SkTextEncoding: - count = SkUTF16_CountUnichars((const uint16_t*)text, SkToInt(byteLength >> 1)); + count = SkUTF16_CountUnichars((const uint16_t*)text, byteLength); break; case kUTF32_SkTextEncoding: count = SkToInt(byteLength >> 2); |