From 08b62c8daa3be1c88a971bcd9c198b187a052877 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 30 Jul 2019 16:01:15 +0100
Subject: Don't try to print XML if a corrupted asset is actually binary data

---
 OpenSim/Framework/Util.cs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'OpenSim')

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
             if (length > 2000)
                 xml = xml.Substring(0, 2000) + "...";
 
+            for (int i = 0 ; i < xml.Length ; i++)
+            {
+                if (xml[i] < 0x20)
+                {
+                    xml = "Unprintable binary data";
+                    break;
+                }
+            }
+
             m_log.ErrorFormat("{0} Failed XML ({1} bytes) = {2}", message, length, xml);
         }
 
-- 
cgit v1.1