diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-11-27 16:37:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-27 16:37:45 +0100 |
| commit | d395f7082876db14b592952eb91961a62d9bc604 (patch) | |
| tree | e2e366ae264386dd0be5aec9eaab301dd9b48853 | |
| parent | 43f60c94e8ba1013b6757e8a14741a81a5d1c319 (diff) | |
| parent | 98daa0af6b0ebf1d6d8a2418eca0b516eb3886db (diff) | |
Merge pull request #43500 from AndreaCatania/gds_fixes
Fixes crash when parse_expression returns nullptr.
| -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 a74fc7193a..372af204f5 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; if (current_function) { push_warning(result, GDScriptWarning::UNREACHABLE_CODE, current_function->identifier->name); |