Merge pull request #814 from Spartan322/merge/61accf0

Merge commit godotengine/godot@61accf0

1 files changed, 4 insertions, 0 deletions

diff --git a/core/string/ustring.cpp b/core/string/ustring.cpp
index 127676a9f9..c6ce1ffbcb 100644
--- a/core/string/ustring.cpp
+++ b/core/string/ustring.cpp
@@ -1852,6 +1852,8 @@ String String::num(double p_num, int p_decimals) {
 }
 
 String String::num_int64(int64_t p_num, int base, bool capitalize_hex) {
+	ERR_FAIL_COND_V_MSG(base < 2 || base > 36, "", "Cannot convert to base " + itos(base) + ", since the value is " + (base < 2 ? "less than 2." : "greater than 36."));
+
 	bool sign = p_num < 0;
 
 	int64_t n = p_num;
@@ -1890,6 +1892,8 @@ String String::num_int64(int64_t p_num, int base, bool capitalize_hex) {
 }
 
 String String::num_uint64(uint64_t p_num, int base, bool capitalize_hex) {
+	ERR_FAIL_COND_V_MSG(base < 2 || base > 36, "", "Cannot convert to base " + itos(base) + ", since the value is " + (base < 2 ? "less than 2." : "greater than 36."));
+
 	uint64_t n = p_num;
 
 	int chars = 0;