asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #54083 from Rubonnek/add_bin_messages_3x

Browse source
This commit is contained in:
Rémi Verschelde 2022-07-05 23:04:15 +02:00 committed by GitHub
commit be85923dc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/ustring.cpp
View file

@ -1785,9 +1785,7 @@ int64_t String::hex_to_int64(bool p_with_prefix) const {
int64_t String::bin_to_int64(bool p_with_prefix) const { int64_t String::bin_to_int64(bool p_with_prefix) const {
int len = length(); int len = length();
if (len == 0 || (p_with_prefix && len < 3)) { ERR_FAIL_COND_V_MSG(p_with_prefix ? len < 3 : len == 0, 0, String("Invalid binary notation length in string ") + (p_with_prefix ? "with" : "without") + " prefix \"" + *this + "\".");
return 0;
}
const CharType *s = ptr(); const CharType *s = ptr();
@ -1798,9 +1796,7 @@ int64_t String::bin_to_int64(bool p_with_prefix) const {
} }
if (p_with_prefix) { if (p_with_prefix) {
if (s[0] != '0' || s[1] != 'b') { ERR_FAIL_COND_V_MSG(s[0] != '0' || LOWERCASE(s[1]) != 'b', 0, "Invalid binary notation prefix in string \"" + *this + "\".");
return 0;
}
s += 2; s += 2;
} }
@ -1812,7 +1808,7 @@ int64_t String::bin_to_int64(bool p_with_prefix) const {
if (c == '0' || c == '1') { if (c == '0' || c == '1') {
n = c - '0'; n = c - '0';
} else { } else {
return 0; ERR_FAIL_V_MSG(0, "Invalid binary 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 = ((binary > INT64_MAX / 2) && (sign == 1 || (sign == -1 && binary != (INT64_MAX >> 1) + 1))) || (sign == -1 && binary == (INT64_MAX >> 1) + 1 && c > '0'); bool overflow = ((binary > INT64_MAX / 2) && (sign == 1 || (sign == -1 && binary != (INT64_MAX >> 1) + 1))) || (sign == -1 && binary == (INT64_MAX >> 1) + 1 && c > '0');