From ff5fd5738cbcef72cf4503b95151e09128c70ccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=98=E9=9F=AC=20=E5=BC=A0?= <hongtao_zhang@outlook.com>
Date: Mon, 22 Feb 2021 11:46:31 +0800
Subject: [PATCH] fix potential uri format issue causing program crash

---
 Flow.Launcher.Infrastructure/Http/Http.cs | 40 ++++++++++++++---------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/Flow.Launcher.Infrastructure/Http/Http.cs b/Flow.Launcher.Infrastructure/Http/Http.cs
index de2e82359..8c7328aa3 100644
--- a/Flow.Launcher.Infrastructure/Http/Http.cs
+++ b/Flow.Launcher.Infrastructure/Http/Http.cs
@@ -50,25 +50,35 @@ namespace Flow.Launcher.Infrastructure.Http
         /// </summary>
         public static void UpdateProxy(ProxyProperty property)
         {
-            (WebProxy.Address, WebProxy.Credentials) = property switch
+            if (string.IsNullOrEmpty(Proxy.Server))
+                return;
+
+            try
             {
-                ProxyProperty.Enabled => Proxy.Enabled switch
+                (WebProxy.Address, WebProxy.Credentials) = property switch
                 {
-                    true => Proxy.UserName switch
+                    ProxyProperty.Enabled => Proxy.Enabled switch
                     {
-                        var userName when !string.IsNullOrEmpty(userName) =>
-                            (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), null),
-                        _ => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"),
-                            new NetworkCredential(Proxy.UserName, Proxy.Password))
+                        true when !string.IsNullOrEmpty(Proxy.Server) => Proxy.UserName switch
+                        {
+                            var userName when string.IsNullOrEmpty(userName) =>
+                                (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), null),
+                            _ => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"),
+                                new NetworkCredential(Proxy.UserName, Proxy.Password))
+                        },
+                        _ => (null, null)
                     },
-                    false => (null, null)
-                },
-                ProxyProperty.Server => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials),
-                ProxyProperty.Port => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials),
-                ProxyProperty.UserName => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)),
-                ProxyProperty.Password => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)),
-                _ => throw new ArgumentOutOfRangeException()
-            };
+                    ProxyProperty.Server => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials),
+                    ProxyProperty.Port => (new Uri($"http://{Proxy.Server}:{Proxy.Port}"), WebProxy.Credentials),
+                    ProxyProperty.UserName => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)),
+                    ProxyProperty.Password => (WebProxy.Address, new NetworkCredential(Proxy.UserName, Proxy.Password)),
+                    _ => throw new ArgumentOutOfRangeException()
+                };
+            }
+            catch(UriFormatException e)
+            {
+                Log.Exception("Http", "Unable to parse Uri", e);
+            }
         }
 
         public static async Task DownloadAsync([NotNull] string url, [NotNull] string filePath, CancellationToken token = default)