diff options
| author | Wilson E. Alvarez <wilson.e.alvarez1@gmail.com> | 2021-10-21 12:37:26 -0400 |
|---|---|---|
| committer | Wilson E. Alvarez <wilson.e.alvarez1@gmail.com> | 2021-10-21 12:40:14 -0400 |
| commit | 549a48ccc9aa0acd0c0b15f67b1aeae914936996 (patch) | |
| tree | 350558e0d7f178baf0d30e5f9fd79e88065d9b6f /core | |
| parent | 468b987aa38b21b55c1cd8a8d4c03b8e1b2a1373 (diff) | |
Add error messages to String::hex_to_int, and accept capital X in prefix
Diffstat (limited to 'core')
| -rw-r--r-- | core/string/ustring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp index daeb7fbd17..b1e685651e 100644 --- a/core/string/ustring.cpp +++ b/core/string/ustring.cpp @@ -2137,7 +2137,7 @@ int64_t String::hex_to_int() const { s++; } - if (len > 2 && s[0] == '0' && s[1] == 'x') { + if (len > 2 && s[0] == '0' && lower_case(s[1]) == 'x') { s += 2; } @@ -2151,7 +2151,7 @@ int64_t String::hex_to_int() const { } else if (c >= 'a' && c <= 'f') { n = (c - 'a') + 10; } else { - return 0; + ERR_FAIL_COND_V_MSG(true, 0, "Invalid hexadecimal notation character \"" + chr(*s) + "\" in string \"" + *this + "\"."); } // Check for overflow/underflow, with special case to ensure INT64_MIN does not result in error bool overflow = ((hex > INT64_MAX / 16) && (sign == 1 || (sign == -1 && hex != (INT64_MAX >> 4) + 1))) || (sign == -1 && hex == (INT64_MAX >> 4) + 1 && c > '0'); |