Fix app crash if MAC address is empty, return empty string (BornToBeRoot#467)

BornToBeRoot · web-flow · commit 8b1c8cc312c7 · 2021-02-13T02:41:20.000+01:00
Co-authored-by: BornToBeRoot &lt;BornToBeRoot@users.noreply.github.com&gt;
diff --git a/Source/NETworkManager.Converters/PhysicalAddressToStringConverter.cs b/Source/NETworkManager.Converters/PhysicalAddressToStringConverter.cs
@@ -10,7 +10,12 @@ public sealed class PhysicalAddressToStringConverter : IValueConverter
     {
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
-            return value == null ? string.Empty : MACAddressHelper.GetDefaultFormat((PhysicalAddress)value);
+            if (!(value is PhysicalAddress physicalAddress))
+                return string.Empty;
+
+            string macAddress = physicalAddress.ToString();
+
+            return string.IsNullOrEmpty(macAddress) ? string.Empty : MACAddressHelper.GetDefaultFormat(macAddress);
         }
 
         public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,12 @@ public sealed class PhysicalAddressToStringConverter : IValueConverter`
`10`	`10`	`{`
`11`	`11`	`public object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`12`	`12`	`{`
`13`		`- return value == null ? string.Empty : MACAddressHelper.GetDefaultFormat((PhysicalAddress)value);`
	`13`	`+ if (!(value is PhysicalAddress physicalAddress))`
	`14`	`+ return string.Empty;`
	`15`	`+`
	`16`	`+ string macAddress = physicalAddress.ToString();`
	`17`	`+`
	`18`	`+ return string.IsNullOrEmpty(macAddress) ? string.Empty : MACAddressHelper.GetDefaultFormat(macAddress);`
`14`	`19`	`}`
`15`	`20`
`16`	`21`	`public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)`