ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Yengine temp file delete was still bad in case of script errors

Browse Source
This commit is contained in:
UbitUmarov
2018-03-09 21:33:39 +00:00
parent cf5ec5d29c
commit c723a1be16
3 changed files with 53 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
OpenSim/Region/ScriptEngine/YEngine/MMRScriptCompile.cs
View File

@@ -90,46 +90,44 @@ namespace OpenSim.Region.ScriptEngine.Yengine
// Create object file one way or another.
try
{
objFileStream = File.Create (tmpFileName);
// Create abstract syntax tree from raw tokens.
TokenScript tokenScript = ScriptReduce.Reduce(tokenBegin);
if (tokenScript == null)
{
m_log.Warn ("[YEngine]: reduction errors on " + m_ScriptObjCodeKey + " (" + m_CameFrom + ")");
PrintCompilerErrors();
objFileStream.Close();
return null;
}
// Compile abstract syntax tree to write object file.
BinaryWriter objFileWriter = new BinaryWriter (objFileStream);
bool ok = ScriptCodeGen.CodeGen(tokenScript, objFileWriter, sourceHash);
if (!ok)
using(BinaryWriter objFileWriter = new BinaryWriter(File.Create(tmpFileName)))
{
m_log.Warn ("[YEngine]: compile error on " + m_ScriptObjCodeKey + " (" + m_CameFrom + ")");
PrintCompilerErrors ();
objFileWriter.Close ();
return null;
bool ok = ScriptCodeGen.CodeGen(tokenScript, objFileWriter, sourceHash);
if (!ok)
{
m_log.Warn ("[YEngine]: compile error on " + m_ScriptObjCodeKey + " (" + m_CameFrom + ")");
PrintCompilerErrors ();
return null;
}
}
objFileWriter.Close ();
// File has been completely written.
// If there is an old one laying around, delete it now.
// Then re-open the new file for reading from the beginning.
if (File.Exists (objFileName))
File.Replace (tmpFileName, objFileName, null);
if (File.Exists(objFileName))
File.Replace(tmpFileName, objFileName, null);
else
File.Move (tmpFileName, objFileName);
File.Move(tmpFileName, objFileName);
objFileStream = File.OpenRead (objFileName);
objFileStream = File.OpenRead(objFileName);
}
finally
{
// In case something went wrong writing temp file, delete it.
try
{
File.Delete (tmpFileName);
if(File.Exists(tmpFileName))
File.Delete (tmpFileName);
}
catch
{
@@ -169,7 +167,8 @@ namespace OpenSim.Region.ScriptEngine.Yengine
private void PrintCompilerErrors ()
{
m_log.Info ("[YEngine]: - " + m_Part.GetWorldPosition () + " " + m_DescName);
foreach (string error in m_CompilerErrors) {
foreach (string error in m_CompilerErrors)
{
m_log.Info ("[YEngine]: - " + error);
}
}