mirror of
https://github.com/godotengine/godot
synced 2024-09-18 21:51:27 +00:00
Merge pull request #54078 from Rubonnek/add_hex_messages_master
Add error messages to `String::hex_to_int`, and accept capital X in prefix
This commit is contained in:
commit
b6f4f23a5e
|
@ -2137,7 +2137,7 @@ int64_t String::hex_to_int() const {
|
||||||
s++;
|
s++;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (len > 2 && s[0] == '0' && s[1] == 'x') {
|
if (len > 2 && s[0] == '0' && lower_case(s[1]) == 'x') {
|
||||||
s += 2;
|
s += 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2151,7 +2151,7 @@ int64_t String::hex_to_int() const {
|
||||||
} else if (c >= 'a' && c <= 'f') {
|
} else if (c >= 'a' && c <= 'f') {
|
||||||
n = (c - 'a') + 10;
|
n = (c - 'a') + 10;
|
||||||
} else {
|
} 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
|
// 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');
|
bool overflow = ((hex > INT64_MAX / 16) && (sign == 1 || (sign == -1 && hex != (INT64_MAX >> 4) + 1))) || (sign == -1 && hex == (INT64_MAX >> 4) + 1 && c > '0');
|
||||||
|
|
Loading…
Reference in a new issue