Fix: Handle format exception raised by Convert.ToInt32 (#13749)

files-community · Nov 8, 2023 · f4ab096 · f4ab096
1 parent e52b242
commit f4ab096
Showing 1 changed file with 18 additions and 4 deletions.
diff --git a/src/Files.App/ViewModels/Properties/Items/FileProperty.cs b/src/Files.App/ViewModels/Properties/Items/FileProperty.cs
@@ -217,7 +217,7 @@ private IValueConverter GetConverter()
 		/// Converts the property to a string to be displayed
 		/// </summary>
 		/// <returns></returns>
-		private string ConvertToString()
+		private string? ConvertToString()
 		{
 			// Don't attempt any convert null values
 			if (Value is null)
@@ -227,13 +227,27 @@ private string ConvertToString()
 
 			if (EnumeratedList is not null)
 			{
-				var value = "";
-				return EnumeratedList.TryGetValue(Convert.ToInt32(Value), out value) ? value.GetLocalizedResource() : null;
+				try
+				{
+					return EnumeratedList.TryGetValue(Convert.ToInt32(Value), out var value) ? 
+						value.GetLocalizedResource() : null;
+				}
+				catch
+				{
+					return null;
+				}
 			}
 
 			if (DisplayFunction is not null)
 			{
-				return DisplayFunction.Invoke(Value);
+				try
+				{
+					return DisplayFunction.Invoke(Value);
+				}
+				catch
+				{
+					return null;
+				}
 			}
 
 			if (Converter is not null)