Skip to content

Commit b027644

Browse files
committed
Fix potential infinite loop in TypedArray::can_take_variant() and PackedTypedArray::can_take_variant().
1 parent 5be8175 commit b027644

2 files changed

Lines changed: 2 additions & 0 deletions

File tree

core/variant/packed_typed_array.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3130,6 +3130,7 @@ bool PackedTypedArray::can_take_variant(const Variant &p_value) const {
31303130
StringName global_class_name = script->get_global_class_name();
31313131

31323132
if (global_class_name == StringName()) {
3133+
script = script->get_base_script();
31333134
continue;
31343135
}
31353136

core/variant/typed_array.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,6 +1196,7 @@ bool TypedArray::can_take_variant(const Variant &p_value) const {
11961196
StringName global_class_name = script->get_global_class_name();
11971197

11981198
if (global_class_name == StringName()) {
1199+
script = script->get_base_script();
11991200
continue;
12001201
}
12011202

0 commit comments

Comments
 (0)