Merge pull request #78478 from YuriSizov/gdscript-fix-container-eleme…

…nt-cmp Make container element type comparison safe
godotengine · Jun 20, 2023 · d7af287 · d7af287
2 parents 248e524 + f1e79e2
commit d7af287
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/modules/gdscript/gdscript_analyzer.cpp b/modules/gdscript/gdscript_analyzer.cpp
@@ -5003,7 +5003,7 @@ GDScriptParser::DataType GDScriptAnalyzer::get_operation_type(Variant::Operator
  bool hard_operation = p_a.is_hard_type() && p_b.is_hard_type();
 
  if (p_operation == Variant::OP_ADD && a_type == Variant::ARRAY && b_type == Variant::ARRAY) {
- if (p_a.get_container_element_type() == p_a.get_container_element_type()) {
+ if (p_a.has_container_element_type() && p_b.has_container_element_type() && p_a.get_container_element_type() == p_b.get_container_element_type()) {
  r_valid = true;
  result = p_a;
  result.type_source = hard_operation ? GDScriptParser::DataType::ANNOTATED_INFERRED : GDScriptParser::DataType::INFERRED;