From: sr55 <sr55.hb@outlook.com>
Date: Mon, 23 Apr 2018 21:00:44 +0000 (+0100)
Subject: WinGui: Fix some potential null reference exceptions in EnumHelper  #1302
X-Git-Tag: 1.1.1~37
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1adbdca9f2ce54002ec16c7fdf03eabd6d30de33;p=handbrake

WinGui: Fix some potential null reference exceptions in EnumHelper  #1302
---

diff --git a/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs b/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
index 33469f7ba..c4ceaeb94 100644
--- a/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
+++ b/win/CS/HandBrakeWPF/Utilities/EnumHelper.cs
@@ -38,6 +38,11 @@ namespace HandBrakeWPF.Utilities
         /// </returns>
         public static string GetDescription(T value)
         {
+            if (value == null)
+            {
+                return string.Empty;
+            }
+
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
             DescriptionAttribute[] attributes =
                   (DescriptionAttribute[])fieldInfo.GetCustomAttributes(
@@ -52,6 +57,11 @@ namespace HandBrakeWPF.Utilities
         /// <returns>A string name</returns>
         public static string GetDisplay(T value)
         {
+            if (value == null)
+            {
+                return string.Empty;
+            }
+
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
             DisplayName[] attributes = (DisplayName[])fieldInfo.GetCustomAttributes(typeof(DisplayName), false);
 
@@ -108,6 +118,11 @@ namespace HandBrakeWPF.Utilities
         /// </returns>
         public static string GetShortName(T value)
         {
+            if (value == null)
+            {
+                return string.Empty;
+            }
+
             FieldInfo fieldInfo = value.GetType().GetField(value.ToString());
             ShortName[] attributes = (ShortName[])fieldInfo.GetCustomAttributes(typeof(ShortName), false);