disable some XmlResolver

0.9.0.1-postfixes
UbitUmarov 2018-01-04 23:51:43 +00:00
parent 7f49364d65
commit ec6f87d3ef
17 changed files with 23 additions and 5 deletions

View File

@ -93,6 +93,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " + m_log.Debug("[WEBLOADER]: Done downloading region information from server. Total Bytes: " +
xmlSource.Length); xmlSource.Length);
XmlDocument xmlDoc = new XmlDocument(); XmlDocument xmlDoc = new XmlDocument();
xmlDoc.XmlResolver = null;
xmlDoc.LoadXml(xmlSource); xmlDoc.LoadXml(xmlSource);
if (xmlDoc.FirstChild.Name == "Nini") if (xmlDoc.FirstChild.Name == "Nini")
{ {

View File

@ -3138,6 +3138,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (File.Exists(defaultAppearanceFileName)) if (File.Exists(defaultAppearanceFileName))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string name = "*unknown*"; string name = "*unknown*";
string email = "anon@anon"; string email = "anon@anon";
uint regionXLocation = 1000; uint regionXLocation = 1000;

View File

@ -110,6 +110,7 @@ namespace OpenSim.ConsoleClient
public static void LoginReply(string requestUrl, string requestData, string replyData) public static void LoginReply(string requestUrl, string requestData, string replyData)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(replyData); doc.LoadXml(replyData);
@ -169,6 +170,7 @@ namespace OpenSim.ConsoleClient
public static void ReadResponses(string requestUrl, string requestData, string replyData) public static void ReadResponses(string requestUrl, string requestData, string replyData)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(replyData); doc.LoadXml(replyData);

View File

@ -156,6 +156,7 @@ namespace OpenSim.Framework.Serialization.External
return xml; return xml;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xml); doc.LoadXml(xml);
XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart"); XmlNodeList sops = doc.GetElementsByTagName("SceneObjectPart");

View File

@ -671,6 +671,7 @@ namespace OpenSim.Framework
public static string GetFormattedXml(string rawXml) public static string GetFormattedXml(string rawXml)
{ {
XmlDocument xd = new XmlDocument(); XmlDocument xd = new XmlDocument();
xd.XmlResolver=null;
xd.LoadXml(rawXml); xd.LoadXml(rawXml);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();

View File

@ -306,6 +306,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name); m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing any attachments for {0} from simulator-side", sp.Name);
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
string stateData = String.Empty; string stateData = String.Empty;
IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>(); IAttachmentsService attServ = m_scene.RequestModuleInterface<IAttachmentsService>();
@ -372,6 +373,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
if (itemData.TryGetValue(attach.ItemID, out xmlData)) if (itemData.TryGetValue(attach.ItemID, out xmlData))
{ {
d = new XmlDocument(); d = new XmlDocument();
d.XmlResolver=null;
d.LoadXml(xmlData); d.LoadXml(xmlData);
m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID); m_log.InfoFormat("[ATTACHMENT]: Found saved state for item {0}, loading it", attach.ItemID);
} }

View File

@ -93,6 +93,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess.Tests
Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID); Assert.AreEqual(foreignUrl, ncAssetGet.CreatorID);
string xmlData = Utils.BytesToString(ncAssetGet.Data); string xmlData = Utils.BytesToString(ncAssetGet.Data);
XmlDocument ncAssetGetXmlDoc = new XmlDocument(); XmlDocument ncAssetGetXmlDoc = new XmlDocument();
ncAssetGetXmlDoc.XmlResolver=null;
ncAssetGetXmlDoc.LoadXml(xmlData); ncAssetGetXmlDoc.LoadXml(xmlData);
// Console.WriteLine(ncAssetGetXmlDoc.OuterXml); // Console.WriteLine(ncAssetGetXmlDoc.OuterXml);

View File

@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser
MemoryStream stream = new MemoryStream(); MemoryStream stream = new MemoryStream();
XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8); XmlTextWriter formatter = new XmlTextWriter(stream, Encoding.UTF8);
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlstream); doc.LoadXml(xmlstream);
formatter.Formatting = Formatting.Indented; formatter.Formatting = Formatting.Indented;
doc.WriteContentTo(formatter); doc.WriteContentTo(formatter);

View File

@ -2420,6 +2420,7 @@ namespace OpenSim.Region.Framework.Scenes
else else
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData); doc.LoadXml(xmlData);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
XmlElement coll = (XmlElement)e; XmlElement coll = (XmlElement)e;

View File

@ -505,6 +505,7 @@ namespace OpenSim.Region.Framework.Scenes
foreach (KeyValuePair<UUID, string> state in states) foreach (KeyValuePair<UUID, string> state in states)
{ {
XmlDocument sdoc = new XmlDocument(); XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
sdoc.LoadXml(state.Value); sdoc.LoadXml(state.Value);
XmlNodeList rootL = sdoc.GetElementsByTagName("State"); XmlNodeList rootL = sdoc.GetElementsByTagName("State");
XmlNode rootNode = rootL[0]; XmlNode rootNode = rootL[0];
@ -540,6 +541,7 @@ namespace OpenSim.Region.Framework.Scenes
return; return;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try try
{ {
doc.LoadXml(objXMLData); doc.LoadXml(objXMLData);

View File

@ -1994,6 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes
public void SaveScriptedState(XmlTextWriter writer, bool oldIDs) public void SaveScriptedState(XmlTextWriter writer, bool oldIDs)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<UUID,string> states = new Dictionary<UUID,string>(); Dictionary<UUID,string> states = new Dictionary<UUID,string>();
SceneObjectPart[] parts = m_parts.GetArray(); SceneObjectPart[] parts = m_parts.GetArray();
@ -2782,7 +2783,7 @@ namespace OpenSim.Region.Framework.Scenes
return RootPart.Torque; return RootPart.Torque;
} }
// This is used by both Double-Click Auto-Pilot and llMoveToTarget() in an attached object // This is used by llMoveToTarget() in an attached object
public void MoveToTarget(Vector3 target, float tau) public void MoveToTarget(Vector3 target, float tau)
{ {
if (IsAttachment) if (IsAttachment)
@ -2790,7 +2791,7 @@ namespace OpenSim.Region.Framework.Scenes
ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar); ScenePresence avatar = m_scene.GetScenePresence(AttachedAvatar);
if (avatar != null) if (avatar != null)
avatar.MoveToTarget(target, false, false); avatar.MoveToTarget(target, false, false, tau);
} }
else else
{ {

View File

@ -455,7 +455,7 @@ namespace OpenSim.Region.Framework.Scenes
if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID)) if (m_part.ParentGroup.m_savedScriptState.ContainsKey(stateID))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]); doc.LoadXml(m_part.ParentGroup.m_savedScriptState[stateID]);
////////// CRUFT WARNING /////////////////////////////////// ////////// CRUFT WARNING ///////////////////////////////////

View File

@ -147,6 +147,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
} }
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xml); doc.LoadXml(xml);
XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject"); XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
if (e == null) if (e == null)

View File

@ -255,6 +255,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
try try
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
doc.LoadXml(xmlData); doc.LoadXml(xmlData);
XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart"); XmlNodeList parts = doc.GetElementsByTagName("SceneObjectPart");

View File

@ -207,6 +207,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
public static void Deserialize(string xml, ScriptInstance instance) public static void Deserialize(string xml, ScriptInstance instance)
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
Dictionary<string, object> vars = instance.GetVars(); Dictionary<string, object> vars = instance.GetVars();

View File

@ -2098,6 +2098,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
string xml = instance.GetXMLState(); string xml = instance.GetXMLState();
XmlDocument sdoc = new XmlDocument(); XmlDocument sdoc = new XmlDocument();
sdoc.XmlResolver=null;
bool loadedState = true; bool loadedState = true;
try try
{ {
@ -2253,6 +2254,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
return false; return false;
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver=null;
try try
{ {

View File

@ -513,7 +513,7 @@ namespace OpenSim.Server.Base
Dictionary<string, object> ret = new Dictionary<string, object>(); Dictionary<string, object> ret = new Dictionary<string, object>();
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.XmlResolver = null;
try try
{ {
doc.LoadXml(data); doc.LoadXml(data);