Switched to Uri.TryCreate to validate uri creation for modular mods. It now returns null if the uri fails to be created properly and will not crash the program when attempting to update.

Author: ItsEasyActually

SA-Mod-Manager/Updater/ModUpdater.cs

@@ -223,90 +223,95 @@ public async Task<ModDownload> CheckModularVersion(ModInfo mod, string modsFolde
                 mod.UpdateUrl += "/";
             }
 
-            var url = new Uri(mod.UpdateUrl);
-            url = new Uri(url, "mod.ini");
-
-            ModInfo remoteInfo;
-
-            try
-            {
-                Dictionary<string, Dictionary<string, string>> dict = IniFile.Load(await client.GetStreamAsync(url));
-                remoteInfo = IniSerializer.Deserialize<ModInfo>(dict);
-            }
-            catch (Exception ex)
-            {
-                errors.Add($"[{mod.Name}] Error pulling mod.ini from \"{mod.UpdateUrl}\": {ex.Message}");
-                return null;
-            }
-
-            if (!ForceUpdate && remoteInfo.Version == mod.Version)
+            string url = mod.UpdateUrl + "mod.ini";
+            Uri modQuery;
+            if (Uri.TryCreate(url, new UriCreationOptions(), out modQuery))
             {
-                return null;
-            }
-
-            string manString;
+                ModInfo remoteInfo;
 
-            try
-            {
-                manString = await client.GetStringAsync(new Uri(new Uri(mod.UpdateUrl), "mod.manifest"));
-            }
-            catch (Exception ex)
-            {
-                errors.Add($"[{mod.Name}] Error pulling mod.manifest from \"{mod.UpdateUrl}\": {ex.Message}");
-                return null;
-            }
-
-            List<ModManifestEntry> remoteManifest;
+                try
+                {
+                    Dictionary<string, Dictionary<string, string>> dict = IniFile.Load(await client.GetStreamAsync(url));
+                    remoteInfo = IniSerializer.Deserialize<ModInfo>(dict);
+                }
+                catch (Exception ex)
+                {
+                    errors.Add($"[{mod.Name}] Error pulling mod.ini from \"{mod.UpdateUrl}\": {ex.Message}");
+                    return null;
+                }
 
-            try
-            {
-                remoteManifest = ModManifest.FromString(manString);
-            }
-            catch (Exception ex)
-            {
-                errors.Add($"[{mod.Name}] Error parsing remote manifest from \"{mod.UpdateUrl}\": {ex.Message}");
-                return null;
-            }
+                if (!ForceUpdate && remoteInfo.Version == mod.Version)
+                {
+                    return null;
+                }
 
-            List<ModManifestDiff> diff = ModManifestGenerator.Diff(remoteManifest, localManifest);
+                string manString;
 
-            if (diff.Count < 1 || diff.All(x => x.State == ModManifestState.Unchanged))
-            {
-                return null;
-            }
+                try
+                {
+                    manString = await client.GetStringAsync(new Uri(new Uri(mod.UpdateUrl), "mod.manifest"));
+                }
+                catch (Exception ex)
+                {
+                    errors.Add($"[{mod.Name}] Error pulling mod.manifest from \"{mod.UpdateUrl}\": {ex.Message}");
+                    return null;
+                }
 
-            string changes;
+                List<ModManifestEntry> remoteManifest;
 
-            if (!string.IsNullOrEmpty(mod.ChangelogUrl))
-            {
                 try
                 {
-                    changes = await client.GetStringAsync(new Uri(mod.ChangelogUrl));
+                    remoteManifest = ModManifest.FromString(manString);
                 }
                 catch (Exception ex)
                 {
-                    changes = ex.Message;
+                    errors.Add($"[{mod.Name}] Error parsing remote manifest from \"{mod.UpdateUrl}\": {ex.Message}");
+                    return null;
                 }
-            }
-            else
-            {
-                try
+
+                List<ModManifestDiff> diff = ModManifestGenerator.Diff(remoteManifest, localManifest);
+
+                if (diff.Count < 1 || diff.All(x => x.State == ModManifestState.Unchanged))
                 {
-                    changes = await client.GetStringAsync(new Uri(new Uri(mod.UpdateUrl), "changelog.txt"));
+                    return null;
                 }
-                catch
+
+                string changes;
+
+                if (!string.IsNullOrEmpty(mod.ChangelogUrl))
                 {
-                    // ignored
-                    changes = string.Empty;
+                    try
+                    {
+                        changes = await client.GetStringAsync(new Uri(mod.ChangelogUrl));
+                    }
+                    catch (Exception ex)
+                    {
+                        changes = ex.Message;
+                    }
+                }
+                else
+                {
+                    try
+                    {
+                        changes = await client.GetStringAsync(new Uri(new Uri(mod.UpdateUrl), "changelog.txt"));
+                    }
+                    catch
+                    {
+                        // ignored
+                        changes = string.Empty;
+                    }
                 }
-            }
 
-            if (!string.IsNullOrEmpty(changes))
-            {
-                changes = Regex.Replace(changes, "(?<!\r)\n", "\r\n");
-            }
+                if (!string.IsNullOrEmpty(changes))
+                {
+                    changes = Regex.Replace(changes, "(?<!\r)\n", "\r\n");
+                }
 
-            return new ModDownload(mod, basePath == null ? Path.Combine(modsFolder, folder) : Path.Combine(basePath, modsFolder, folder), mod.UpdateUrl, changes, diff);
+                return new ModDownload(mod, basePath == null ? Path.Combine(modsFolder, folder) : Path.Combine(basePath, modsFolder, folder), mod.UpdateUrl, changes, diff);
+            }
+            else
+                return null;
+            
         }
 
         // TODO: cancel