diff options
| author | Andrea Catania <info@andreacatania.com> | 2020-11-13 15:09:52 +0100 |
|---|---|---|
| committer | Andrea Catania <info@andreacatania.com> | 2020-11-13 15:09:52 +0100 |
| commit | 98daa0af6b0ebf1d6d8a2418eca0b516eb3886db (patch) | |
| tree | 9808359578cb2a15ddbca7396caeddeebdf4dc2a /modules/gdscript | |
| parent | f73374629dd57d3eea6a960859ca223fa2d95fc4 (diff) | |
Fixes crash when returns .
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gdscript_parser.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index fde3662d66..81a10c1199 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -184,6 +184,7 @@ void GDScriptParser::push_error(const String &p_message, const Node *p_origin) { #ifdef DEBUG_ENABLED void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_code, const String &p_symbol1, const String &p_symbol2, const String &p_symbol3, const String &p_symbol4) { + ERR_FAIL_COND(p_source == nullptr); Vector<String> symbols; if (!p_symbol1.empty()) { symbols.push_back(p_symbol1); @@ -201,6 +202,7 @@ void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_ } void GDScriptParser::push_warning(const Node *p_source, GDScriptWarning::Code p_code, const Vector<String> &p_symbols) { + ERR_FAIL_COND(p_source == nullptr); if (is_ignoring_warnings) { return; } @@ -1419,7 +1421,7 @@ GDScriptParser::Node *GDScriptParser::parse_statement() { } #ifdef DEBUG_ENABLED - if (unreachable) { + if (unreachable && result != nullptr) { current_suite->has_unreachable_code = true; push_warning(result, GDScriptWarning::UNREACHABLE_CODE, current_function->identifier->name); } |