Further fixes when script->data is null in decompiler

xNVSE · Apr 10, 2022 · 13471a6 · 13471a6
1 parent 86d3866
commit 13471a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/nvse/nvse/Commands_Script.cpp b/nvse/nvse/Commands_Script.cpp
@@ -968,6 +968,12 @@ bool Cmd_CallWhen_OLD_Execute(COMMAND_ARGS)
 void DecompileScriptToFolder(const std::string& scriptName, Script* script, const std::string& fileExtension, const std::string_view& modName)
 {
 	ScriptParsing::ScriptAnalyzer analyzer(script);
+	if (analyzer.error)
+	{
+		if (IsConsoleMode())
+			Console_Print("Script %s is not compiled", scriptName.c_str());
+		return;
+	}
 	const auto* dirName = "DecompiledScripts";
 	if (!std::filesystem::exists(dirName))
 		std::filesystem::create_directory(dirName);

diff --git a/nvse/nvse/ScriptAnalyzer.cpp b/nvse/nvse/ScriptAnalyzer.cpp
@@ -92,6 +92,8 @@ bool ScriptParsing::ScriptContainsCommand(Script* script, CommandInfo* info, Com
 bool ScriptParsing::PluginDecompileScript(Script* script, SInt32 lineNumber, char* buffer, UInt32 bufferSize)
 {
 	ScriptAnalyzer analyzer(script);
+	if (analyzer.error)
+		return false;
 	if (lineNumber != -1)
 	{
 		if (lineNumber >= analyzer.lines.size())
@@ -142,6 +144,8 @@ double ScriptParsing::ScriptIterator::ReadDouble()
 
 void ScriptParsing::ScriptIterator::ReadLine()
 {
+	if (!script->data)
+		return;
 	opcode = Read16();
 	if (opcode == static_cast<UInt16>(ScriptStatementCode::ReferenceFunction))
 	{
@@ -1126,18 +1130,18 @@ ScriptParsing::ScriptAnalyzer::ScriptAnalyzer(Script* script, bool parse) : iter
 	if (!script->data)
 	{
 		this->error = true;
-		return;
 	}
 	g_analyzerStack.push(this);
-	if (parse)
+	if (parse && !this->error)
 	{
 		Parse();
 	}
 }
 
 ScriptParsing::ScriptAnalyzer::~ScriptAnalyzer()
 {
-	g_analyzerStack.pop();
+	if (!g_analyzerStack.empty())
+		g_analyzerStack.pop();
 }