seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #99985 from allenwp/release-only-crash-99797

Browse Source 
Print error message when index is out of range in `Variant::iter_get`
This commit is contained in:
Thaddeus Crews
2025-05-13 16:22:11 -05:00
parent 88c0552077 5657ecc542
commit 172794337c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/variant/variant_setget.cpp
View File

@ -1833,6 +1833,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1844,6 +1845,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedByteArray of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1855,6 +1857,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int32_t idx = r_iter; int32_t idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedInt32Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1866,6 +1869,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int64_t idx = r_iter; int64_t idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedInt64Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1877,6 +1881,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedFloat32Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1888,6 +1893,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedFloat64Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1899,6 +1905,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedStringArray of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1910,6 +1917,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedVector2Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1921,6 +1929,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedVector3Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1932,6 +1941,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedColorArray of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }
@ -1943,6 +1953,7 @@ Variant Variant::iter_get(const Variant &r_iter, bool &r_valid) const {
int idx = r_iter; int idx = r_iter;
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED
if (idx < 0 || idx >= arr->size()) { if (idx < 0 || idx >= arr->size()) {
ERR_PRINT(vformat("iter_get: Index %d is out of bounds for PackedVector4Array of size %d.", idx, arr->size()));
r_valid = false; r_valid = false;
return Variant(); return Variant();
} }