diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-20 21:31:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-20 21:31:12 +0100 |
| commit | 083d088de3fe7cd5d825cebebc46ce32fc87b4b0 (patch) | |
| tree | 9b2524105bf989f6ac0ad1c488ac493f558a391f /core/ustring.cpp | |
| parent | 719254ae0d4e1b7c9be36a4399809caf270d7e86 (diff) | |
| parent | 99d8626f4a313471410db421891e90fe768cd929 (diff) | |
Merge pull request #33583 from qarmin/fix_overflows_unitialized
Fix some overflows and unitialized variables
Diffstat (limited to 'core/ustring.cpp')
| -rw-r--r-- | core/ustring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index 0f82ca7e15..25930db201 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -1416,7 +1416,7 @@ bool String::parse_utf8(const char *p_utf8, int p_len) { if (skip == 0) { - uint8_t c = *ptrtmp; + uint8_t c = *ptrtmp >= 0 ? *ptrtmp : uint8_t(256 + *ptrtmp); /* Determine the number of characters in sequence */ if ((c & 0x80) == 0) |