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/SkUtils.h | |
| 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/SkUtils.h')
| -rw-r--r-- | src/core/SkUtils.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/core/SkUtils.h b/src/core/SkUtils.h index d894467ce6..9d7c64524f 100644 --- a/src/core/SkUtils.h +++ b/src/core/SkUtils.h @@ -43,13 +43,10 @@ inline int SkUTF8_CountUTF8Bytes(const char utf8[]) { int SkUTF8_CountUnichars(const char utf8[]); -/** This function is safe: invalid UTF8 sequences will return -1; */ -int SkUTF8_CountUnicharsWithError(const char utf8[], size_t byteLength); - -/** This function is safe: invalid UTF8 sequences will return 0; */ -inline int SkUTF8_CountUnichars(const char utf8[], size_t byteLength) { - return SkClampPos(SkUTF8_CountUnicharsWithError(utf8, byteLength)); -} +/** These functions are safe: invalid sequences will return -1; */ +int SkUTF8_CountUnichars(const void* utf8, size_t byteLength); +int SkUTF16_CountUnichars(const void* utf16, size_t byteLength); +int SkUTF32_CountUnichars(const void* utf32, size_t byteLength); /** This function is safe: invalid UTF8 sequences will return -1 * When -1 is returned, ptr is unchanged. @@ -83,7 +80,6 @@ size_t SkUTF8_FromUnichar(SkUnichar uni, char utf8[] = nullptr); #define SkUTF16_IsLowSurrogate(c) (((c) & 0xFC00) == 0xDC00) int SkUTF16_CountUnichars(const uint16_t utf16[]); -int SkUTF16_CountUnichars(const uint16_t utf16[], int numberOf16BitValues); // returns the current unichar and then moves past it (*p++) SkUnichar SkUTF16_NextUnichar(const uint16_t**); // this guy backs up to the previus unichar value, and returns it (*--p) |