From 61d576ec6ecea5d2883e5ac09b48be275d4c0b86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 30 May 2014 19:07:15 +0200 Subject: [PATCH] harden map search preview against invalid data fixes #5492 --- OpenRA.Game/Map/MapCache.cs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/OpenRA.Game/Map/MapCache.cs b/OpenRA.Game/Map/MapCache.cs index 0a7ea1d6cd..e2371fb718 100644 --- a/OpenRA.Game/Map/MapCache.cs +++ b/OpenRA.Game/Map/MapCache.cs @@ -93,10 +93,16 @@ namespace OpenRA } var data = Encoding.UTF8.GetString(i.Result); - var yaml = MiniYaml.FromString(data); - - foreach (var kv in yaml) - maps[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value); + try + { + var yaml = MiniYaml.FromString(data); + foreach (var kv in yaml) + maps[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value); + } + catch + { + Log.Write("debug", "Can't parse remote map search data:\n{0}", data); + } }; new Download(url, _ => { }, onInfoComplete);