Skip to content

Commit

Permalink
Fix: Correctly handle invalid XML files. (Various)
Browse files Browse the repository at this point in the history
  • Loading branch information
@leezer3
leezer3 committed Jan 12, 2017
1 parent 3b1810e commit 069d7fc
Show file tree
Hide file tree
Showing 4 changed files with 166 additions and 136 deletions.
272 changes: 139 additions & 133 deletions source/ObjectViewer/Parsers/Ls3DGrpParser.cs
View file
Original file line number Diff line number Diff line change
@@ -1,144 +1,150 @@
using System;
using System.Windows.Forms;
using System.Xml;
using OpenBveApi.Objects;

namespace OpenBve
{
internal static class Ls3DGrpParser
{
internal static class Ls3DGrpParser
{

internal class GruppenObject
{
//A gruppenobject holds a list of ls3dobjs, which appear to be roughly equivilant to meshbuilders
internal string Name;
internal World.Vector3D Position;
internal class GruppenObject
{
//A gruppenobject holds a list of ls3dobjs, which appear to be roughly equivilant to meshbuilders
internal string Name;
internal World.Vector3D Position;

internal double RotationX;
internal double RotationY;
internal double RotationZ;
}
internal double RotationX;
internal double RotationY;
internal double RotationZ;
}

internal static ObjectManager.AnimatedObjectCollection ReadObject(string FileName, System.Text.Encoding Encoding,
ObjectManager.ObjectLoadMode LoadMode)
{
XmlDocument currentXML = new XmlDocument();
//May need to be changed to use de-DE
System.Globalization.CultureInfo Culture = System.Globalization.CultureInfo.InvariantCulture;
ObjectManager.AnimatedObjectCollection Result = new ObjectManager.AnimatedObjectCollection();
Result.Objects = new ObjectManager.AnimatedObject[0];
int ObjectCount = 0;
currentXML.Load(FileName);
string BaseDir = System.IO.Path.GetDirectoryName(FileName);
internal static ObjectManager.AnimatedObjectCollection ReadObject(string FileName, System.Text.Encoding Encoding,
ObjectManager.ObjectLoadMode LoadMode)
{
XmlDocument currentXML = new XmlDocument();
//May need to be changed to use de-DE
System.Globalization.CultureInfo Culture = System.Globalization.CultureInfo.InvariantCulture;
ObjectManager.AnimatedObjectCollection Result = new ObjectManager.AnimatedObjectCollection();
Result.Objects = new ObjectManager.AnimatedObject[0];
int ObjectCount = 0;
try
{
currentXML.Load(FileName);
}
catch
{
return null;
}

string BaseDir = System.IO.Path.GetDirectoryName(FileName);

GruppenObject[] CurrentObjects = new GruppenObject[0];
//Check for null
if (currentXML.DocumentElement != null)
{
ObjectManager.UnifiedObject[] obj = new OpenBve.ObjectManager.UnifiedObject[0];
XmlNodeList DocumentNodes = currentXML.DocumentElement.SelectNodes("/GRUPPENOBJECT");
if (DocumentNodes != null)
{
foreach (XmlNode outerNode in DocumentNodes)
{
if (outerNode.HasChildNodes)
{
foreach (XmlNode node in outerNode.ChildNodes)
{
if (node.Name == "Object" && node.HasChildNodes)
{
foreach (XmlNode childNode in node.ChildNodes)
{
if (childNode.Name == "Props" && childNode.Attributes != null)
{
Array.Resize<GruppenObject>(ref CurrentObjects, CurrentObjects.Length + 1);
GruppenObject Object = new GruppenObject();
foreach (XmlAttribute attribute in childNode.Attributes)
{
switch (attribute.Name)
{
case "Name":
string ObjectFile = OpenBveApi.Path.CombineFile(BaseDir,attribute.Value);
Object.Name = ObjectFile;
ObjectCount++;
break;
case "Position":
string[] SplitPosition = attribute.Value.Split(';');
double.TryParse(SplitPosition[0], out Object.Position.X);
double.TryParse(SplitPosition[1], out Object.Position.Y);
double.TryParse(SplitPosition[2], out Object.Position.Z);
break;
case "Rotation":
string[] SplitRotation = attribute.Value.Split(';');
GruppenObject[] CurrentObjects = new GruppenObject[0];
//Check for null
if (currentXML.DocumentElement != null)
{
ObjectManager.UnifiedObject[] obj = new OpenBve.ObjectManager.UnifiedObject[0];
XmlNodeList DocumentNodes = currentXML.DocumentElement.SelectNodes("/GRUPPENOBJECT");
if (DocumentNodes != null)
{
foreach (XmlNode outerNode in DocumentNodes)
{
if (outerNode.HasChildNodes)
{
foreach (XmlNode node in outerNode.ChildNodes)
{
if (node.Name == "Object" && node.HasChildNodes)
{
foreach (XmlNode childNode in node.ChildNodes)
{
if (childNode.Name == "Props" && childNode.Attributes != null)
{
Array.Resize<GruppenObject>(ref CurrentObjects, CurrentObjects.Length + 1);
GruppenObject Object = new GruppenObject();
foreach (XmlAttribute attribute in childNode.Attributes)
{
switch (attribute.Name)
{
case "Name":
string ObjectFile = OpenBveApi.Path.CombineFile(BaseDir,attribute.Value);
Object.Name = ObjectFile;
ObjectCount++;
break;
case "Position":
string[] SplitPosition = attribute.Value.Split(';');
double.TryParse(SplitPosition[0], out Object.Position.X);
double.TryParse(SplitPosition[1], out Object.Position.Y);
double.TryParse(SplitPosition[2], out Object.Position.Z);
break;
case "Rotation":
string[] SplitRotation = attribute.Value.Split(';');

double.TryParse(SplitRotation[0], out Object.RotationX);
double.TryParse(SplitRotation[1], out Object.RotationY);
double.TryParse(SplitRotation[2], out Object.RotationZ);
break;
}
}
CurrentObjects[CurrentObjects.Length - 1] = Object;
}
}
}
}
}
}
//We've loaded the XML references, now load the objects into memory
for (int i = 0; i < CurrentObjects.Length; i++)
{
var Object = ObjectManager.LoadObject(CurrentObjects[i].Name, Encoding, LoadMode, false, false, false, CurrentObjects[i].RotationX, CurrentObjects[i].RotationY, CurrentObjects[i].RotationZ);
if (Object != null)
{
Array.Resize<ObjectManager.UnifiedObject>(ref obj, obj.Length +1);
obj[obj.Length - 1] = Object;
}
}
for (int j = 0; j < obj.Length; j++)
{
if (obj[j] != null)
{
Array.Resize<ObjectManager.AnimatedObject>(ref Result.Objects, Result.Objects.Length + 1);
if (obj[j] is ObjectManager.StaticObject)
{
ObjectManager.StaticObject s = (ObjectManager.StaticObject) obj[j];
s.Dynamic = true;
ObjectManager.AnimatedObject a = new ObjectManager.AnimatedObject();
ObjectManager.AnimatedObjectState aos = new ObjectManager.AnimatedObjectState
{
Object = s,
Position = CurrentObjects[j].Position
};
a.States = new ObjectManager.AnimatedObjectState[] {aos};
Result.Objects[j] = a;
ObjectCount++;
}
else if (obj[j] is ObjectManager.AnimatedObjectCollection)
{
ObjectManager.AnimatedObjectCollection a =
(ObjectManager.AnimatedObjectCollection) obj[j];
for (int k = 0; k < a.Objects.Length; k++)
{
for (int h = 0; h < a.Objects[k].States.Length; h++)
{
a.Objects[k].States[h].Position.X += CurrentObjects[j].Position.X;
a.Objects[k].States[h].Position.Y += CurrentObjects[j].Position.Y;
a.Objects[k].States[h].Position.Z += CurrentObjects[j].Position.Z;
}
Result.Objects[j] = a.Objects[k];
ObjectCount++;
}
}
}
}
}
return Result;
}
//Didn't find an acceptable XML object
//Probably will cause things to throw an absolute wobbly somewhere....
return null;
}
}
double.TryParse(SplitRotation[0], out Object.RotationX);
double.TryParse(SplitRotation[1], out Object.RotationY);
double.TryParse(SplitRotation[2], out Object.RotationZ);
break;
}
}
CurrentObjects[CurrentObjects.Length - 1] = Object;
}
}
}
}
}
}
//We've loaded the XML references, now load the objects into memory
for (int i = 0; i < CurrentObjects.Length; i++)
{
var Object = ObjectManager.LoadObject(CurrentObjects[i].Name, Encoding, LoadMode, false, false, false, CurrentObjects[i].RotationX, CurrentObjects[i].RotationY, CurrentObjects[i].RotationZ);
if (Object != null)
{
Array.Resize<ObjectManager.UnifiedObject>(ref obj, obj.Length +1);
obj[obj.Length - 1] = Object;
}
}
for (int j = 0; j < obj.Length; j++)
{
if (obj[j] != null)
{
Array.Resize<ObjectManager.AnimatedObject>(ref Result.Objects, Result.Objects.Length + 1);
if (obj[j] is ObjectManager.StaticObject)
{
ObjectManager.StaticObject s = (ObjectManager.StaticObject) obj[j];
s.Dynamic = true;
ObjectManager.AnimatedObject a = new ObjectManager.AnimatedObject();
ObjectManager.AnimatedObjectState aos = new ObjectManager.AnimatedObjectState
{
Object = s,
Position = CurrentObjects[j].Position
};
a.States = new ObjectManager.AnimatedObjectState[] {aos};
Result.Objects[j] = a;
ObjectCount++;
}
else if (obj[j] is ObjectManager.AnimatedObjectCollection)
{
ObjectManager.AnimatedObjectCollection a =
(ObjectManager.AnimatedObjectCollection) obj[j];
for (int k = 0; k < a.Objects.Length; k++)
{
for (int h = 0; h < a.Objects[k].States.Length; h++)
{
a.Objects[k].States[h].Position.X += CurrentObjects[j].Position.X;
a.Objects[k].States[h].Position.Y += CurrentObjects[j].Position.Y;
a.Objects[k].States[h].Position.Z += CurrentObjects[j].Position.Z;
}
Result.Objects[j] = a.Objects[k];
ObjectCount++;
}
}
}
}
}
return Result;
}
//Didn't find an acceptable XML object
//Probably will cause things to throw an absolute wobbly somewhere....
return null;
}
}
}
10 changes: 9 additions & 1 deletion source/ObjectViewer/Parsers/Ls3DObjectParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,15 @@ internal static ObjectManager.StaticObject ReadObject(string FileName, System.Te
int TextureHeight = 0;
if (File.Exists(FileName))
{
currentXML.Load(FileName);
try
{
currentXML.Load(FileName);
}
catch
{
return null;
}

}
else
{
Expand Down
10 changes: 9 additions & 1 deletion source/OpenBVE/OldParsers/BveRouteParser/CsvRwRouteParser.CompatibilityObjects.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,15 @@ internal static void LoadCompatibilityObjects(string fileName)
}
string d = System.IO.Path.GetDirectoryName(fileName);
XmlDocument currentXML = new XmlDocument();
currentXML.Load(fileName);
try
{
currentXML.Load(fileName);
}
catch
{
return;
}

//Check for null
if (currentXML.DocumentElement != null)
{
Expand Down
10 changes: 9 additions & 1 deletion source/OpenBVE/Parsers/DynamicLightParser.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,15 @@ public static bool ReadLightingXML(string fileName)
//The current XML file to load
XmlDocument currentXML = new XmlDocument();
//Load the object's XML file
currentXML.Load(fileName);
try
{
currentXML.Load(fileName);
}
catch
{
return false;
}

bool defined = false;
//Check for null
if (currentXML.DocumentElement != null)
Expand Down

0 comments on commit 069d7fc

Please sign in to comment.