Browse Source

Merge pull request #43226 from mateosss/unreachable-prop-crash

Fix crash due to unreachable code in properties
George Marques 4 years ago
parent
commit
cf7a6be1db
1 changed files with 5 additions and 1 deletions
  1. 5 1
      modules/gdscript/gdscript_parser.cpp

+ 5 - 1
modules/gdscript/gdscript_parser.cpp

@@ -1421,7 +1421,11 @@ GDScriptParser::Node *GDScriptParser::parse_statement() {
 #ifdef DEBUG_ENABLED
 #ifdef DEBUG_ENABLED
 	if (unreachable) {
 	if (unreachable) {
 		current_suite->has_unreachable_code = true;
 		current_suite->has_unreachable_code = true;
-		push_warning(result, GDScriptWarning::UNREACHABLE_CODE, current_function->identifier->name);
+		if (current_function) {
+			push_warning(result, GDScriptWarning::UNREACHABLE_CODE, current_function->identifier->name);
+		} else {
+			// TODO: Properties setters and getters with unreachable code are not being warned
+		}
 	}
 	}
 #endif
 #endif