Handle exceptions in IsUri

Any exception means it’s not a Uri.
Akash-manna · Jul 29, 2017 · 57c7114 · 57c7114
1 parent 49918b6
commit 57c7114
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/EdgeDeflector/Program.cs b/EdgeDeflector/Program.cs
@@ -94,8 +94,19 @@ private static void RegisterProtocolHandler()
 
         static bool IsUri(string uristring)
         {
-            Uri uri = new Uri(uristring);
-            return uri.IsWellFormedOriginalString();
+            try
+            {
+                Uri uri = new Uri(uristring);
+                return uri.IsWellFormedOriginalString();
+            }
+            catch (System.UriFormatException)
+            {
+                return false;
+            }
+            catch (ArgumentNullException)
+            {
+                return false;
+            }
         }
 
         static bool IsHttpUri(string uri)
@@ -112,7 +123,7 @@ static bool IsMsEdgeUri(string uri)
 
         static bool IsNewCortanaURI(string uri)
         {
-            return (uri.Contains("launchContext1=Microsoft.Windows.Cortana"));
+            return uri.Contains("launchContext1=Microsoft.Windows.Cortana");
         }
 
         static string GetURIFromCortanaLink(string uri)
@@ -177,7 +188,7 @@ static void Main(string[] args)
                 OpenUri(uri);
             }
             // Install when running without argument
-            else if (args.Equals(null) || args.Length == 0)
+            else if (args.Length == 0 || args.Equals(null))
             {
                 if (!IsElevated())
                 {