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

Add error messages to String::bin_to_int64, and accept capital B in prefix

Browse source 
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
This commit is contained in:
Wilson E. Alvarez 2021-10-21 12:46:28 -04:00
parent 27b63247fd
commit a97a016381
No known key found for this signature in database
GPG key ID: A32174A3D2ED3F9E
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

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