Steam Web API puts illegal characters from server names into the XML,…

… which will then cause .NET XmlSerializer to throw an exception. This release replaces invalid characters with spaces.
PredatH0r · Sep 14, 2019 · 63c9c3e · 63c9c3e
1 parent b30c59d
commit 63c9c3e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/QueryMaster/QueryMaster/MasterServerWebApi.cs b/QueryMaster/QueryMaster/MasterServerWebApi.cs
@@ -3,6 +3,7 @@
 using System.Collections.ObjectModel;
 using System.IO;
 using System.Net;
+using System.Text;
 using System.Threading;
 using System.Xml.Serialization;
 
@@ -70,6 +71,20 @@ public override void GetAddresses(Region region, MasterIpCallback callback, IpFi
             var url = $"https://api.steampowered.com/IGameServersService/GetServerList/v1/?key={SteamWebApiKey}&format=xml&filter={filters}&limit={GetAddressesLimit}";
             var xml = cli.DownloadString(url);
             var ser = new XmlSerializer(typeof (Response));
+
+            // replace invalid XML chars ( < 32 ) with char reference
+            var sb = new StringBuilder(xml);
+            for (int i = 0, c = xml.Length; i < c; i++)
+            {
+              if (sb[i] < 32 && !char.IsWhiteSpace(sb[i]))
+                //{
+                //  sb.Insert(i+1, "#" + ((int)sb[i]).ToString() + ";");
+                //  sb[i] = '&';
+                //}
+                sb[i] = ' ';
+            }
+            xml = sb.ToString();
+
             var resp = (Response) ser.Deserialize(new StringReader(xml));
 
             var endpoints = new List<Tuple<IPEndPoint,ServerInfo>>();

diff --git a/QueryMaster/QueryMaster/QueryMaster.csproj b/QueryMaster/QueryMaster/QueryMaster.csproj
@@ -12,10 +12,14 @@
     <AssemblyName>QueryMaster</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <SccProjectName>SAK</SccProjectName>
-    <SccLocalPath>SAK</SccLocalPath>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccProvider>SAK</SccProvider>
+    <SccProjectName>
+    </SccProjectName>
+    <SccLocalPath>
+    </SccLocalPath>
+    <SccAuxPath>
+    </SccAuxPath>
+    <SccProvider>
+    </SccProvider>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
   </PropertyGroup>

diff --git a/ServerBrowser/ServerBrowserForm.cs b/ServerBrowser/ServerBrowserForm.cs
@@ -31,7 +31,7 @@ namespace ServerBrowser
 {
   public partial class ServerBrowserForm : XtraForm
   {
-    private const string Version = "2.50";
+    private const string Version = "2.51";
     private const string DevExpressVersion = "v19.1";
     private const string SteamWebApiText = "<Steam Web API>";
     private const string CustomDetailColumnPrefix = "ServerInfo.";