Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-10-30 21:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Avoid crash after a parsing error in GDScript

Browse source
This commit is contained in:
Pedro J. Estébanez 2021-08-14 17:56:09 +02:00
parent 7c79e361f5
commit 10c9c2ccd4
2 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
modules/gdscript/gdscript_cache.cpp
View file

@ -51,7 +51,9 @@ GDScriptParser *GDScriptParserRef::get_parser() const {
Error GDScriptParserRef::raise_status(Status p_new_status) { Error GDScriptParserRef::raise_status(Status p_new_status) {
ERR_FAIL_COND_V(parser == nullptr, ERR_INVALID_DATA); ERR_FAIL_COND_V(parser == nullptr, ERR_INVALID_DATA);
Error result = OK; if (result != OK) {
return result;
}
while (p_new_status > status) { while (p_new_status > status) {
switch (status) { switch (status) {
@ -86,14 +88,6 @@ Error GDScriptParserRef::raise_status(Status p_new_status) {
} }
} }
if (result != OK) { if (result != OK) {
if (parser != nullptr) {
memdelete(parser);
parser = nullptr;
}
if (analyzer != nullptr) {
memdelete(analyzer);
analyzer = nullptr;
}
return result; return result;
} }
} }

1
modules/gdscript/gdscript_cache.h
View file

@ -54,6 +54,7 @@ private:
GDScriptParser *parser = nullptr; GDScriptParser *parser = nullptr;
GDScriptAnalyzer *analyzer = nullptr; GDScriptAnalyzer *analyzer = nullptr;
Status status = EMPTY; Status status = EMPTY;
Error result = OK;
String path; String path;
friend class GDScriptCache; friend class GDScriptCache;