aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Util.cs
diff options
context:
space:
mode:
authorMelanie2019-07-30 16:01:15 +0100
committerMelanie2019-07-30 16:01:15 +0100
commit08b62c8daa3be1c88a971bcd9c198b187a052877 (patch)
tree9994d3b5f1b3c22ed9c72800053c8c02ba5e82dd /OpenSim/Framework/Util.cs
parentPut back the code to create the ready marker file. (diff)
downloadopensim-SC-08b62c8daa3be1c88a971bcd9c198b187a052877.zip
opensim-SC-08b62c8daa3be1c88a971bcd9c198b187a052877.tar.gz
opensim-SC-08b62c8daa3be1c88a971bcd9c198b187a052877.tar.bz2
opensim-SC-08b62c8daa3be1c88a971bcd9c198b187a052877.tar.xz
Don't try to print XML if a corrupted asset is actually binary data
Diffstat (limited to 'OpenSim/Framework/Util.cs')
-rw-r--r--OpenSim/Framework/Util.cs9
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index f66a987..44aee02 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -3369,6 +3369,15 @@ namespace OpenSim.Framework
3369 if (length > 2000) 3369 if (length > 2000)
3370 xml = xml.Substring(0, 2000) + "..."; 3370 xml = xml.Substring(0, 2000) + "...";
3371 3371
3372 for (int i = 0 ; i < xml.Length ; i++)
3373 {
3374 if (xml[i] < 0x20)
3375 {
3376 xml = "Unprintable binary data";
3377 break;
3378 }
3379 }
3380
3372 m_log.ErrorFormat("{0} Failed XML ({1} bytes) = {2}", message, length, xml); 3381 m_log.ErrorFormat("{0} Failed XML ({1} bytes) = {2}", message, length, xml);
3373 } 3382 }
3374 3383