diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-18 22:20:39 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-04-18 22:20:39 +0200 |
commit | 9a759750421bc72ed41c1dc67c0fa9b5564b8abc (patch) | |
tree | 6916ad6fb910ba682dedfe91d9fe9b736659598c /core/ustring.cpp | |
parent | 9ce8d8ddda35cda781364e9b648325a2953d3f63 (diff) |
Fix some Coverity warnings in String API
- StringName::StringName(const StringName &p_name)
Non-static class member _data is not initialized in this constructor nor in any functions that it calls.
- StringName::_Data()
Non-static class member idx is not initialized in this constructor nor in any functions that it calls.
- String::num_uint64(...)
This less-than-zero comparison of an unsigned value is never true. n % base < 0UL.
- String::hex_to_int(...) and String::hex_to_int64(...)
Execution cannot reach this statement (deadcode)
Diffstat (limited to 'core/ustring.cpp')
-rw-r--r-- | core/ustring.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/core/ustring.cpp b/core/ustring.cpp index 954f590218..0eb6cc1be4 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -1151,7 +1151,7 @@ String String::num_uint64(uint64_t p_num, int base, bool capitalize_hex) { c[chars] = 0; n = p_num; do { - int mod = ABS(n % base); + int mod = n % base; if (mod >= 10) { char a = (capitalize_hex ? 'A' : 'a'); c[--chars] = a + (mod - 10); @@ -1550,8 +1550,7 @@ String::String(const StrRange &p_range) { int String::hex_to_int(bool p_with_prefix) const { - int l = length(); - if (p_with_prefix && l < 3) + if (p_with_prefix && length() < 3) return 0; const CharType *s = ptr(); @@ -1560,17 +1559,13 @@ int String::hex_to_int(bool p_with_prefix) const { if (sign < 0) { s++; - l--; - if (p_with_prefix && l < 2) - return 0; } if (p_with_prefix) { if (s[0] != '0' || s[1] != 'x') return 0; s += 2; - l -= 2; - }; + } int hex = 0; @@ -1596,8 +1591,7 @@ int String::hex_to_int(bool p_with_prefix) const { int64_t String::hex_to_int64(bool p_with_prefix) const { - int l = length(); - if (p_with_prefix && l < 3) + if (p_with_prefix && length() < 3) return 0; const CharType *s = ptr(); @@ -1606,17 +1600,13 @@ int64_t String::hex_to_int64(bool p_with_prefix) const { if (sign < 0) { s++; - l--; - if (p_with_prefix && l < 2) - return 0; } if (p_with_prefix) { if (s[0] != '0' || s[1] != 'x') return 0; s += 2; - l -= 2; - }; + } int64_t hex = 0; @@ -3478,13 +3468,13 @@ bool String::is_valid_hex_number(bool p_with_prefix) const { if (p_with_prefix) { - if (len < 2) + if (len < 3) return false; if (operator[](from) != '0' || operator[](from + 1) != 'x') { return false; - }; + } from += 2; - }; + } for (int i = from; i < len; i++) { @@ -3492,7 +3482,7 @@ bool String::is_valid_hex_number(bool p_with_prefix) const { if ((c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F')) continue; return false; - }; + } return true; }; |