From: Ben Adams <thundercat@illyriad.co.uk>
Date: Fri, 31 Mar 2017 17:50:36 +0000 (+0100)
Subject: Fallback for enum.Format(G) when not valid (dotnet/coreclr#10610)
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7475
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28d1abc83b7c08c564f026057f696426cd7a5e38;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Fallback for enum.Format(G) when not valid (dotnet/coreclr#10610)



Commit migrated from https://github.com/dotnet/coreclr/commit/82e2735a477ffbfd7e8a67f5323c0c964da2a16f
---

diff --git a/src/coreclr/src/mscorlib/src/System/Enum.cs b/src/coreclr/src/mscorlib/src/System/Enum.cs
index 2403b6a..489f367 100644
--- a/src/coreclr/src/mscorlib/src/System/Enum.cs
+++ b/src/coreclr/src/mscorlib/src/System/Enum.cs
@@ -688,7 +688,7 @@ namespace System
 
             char formatCh = format[0];
             if (formatCh == 'G' || formatCh == 'g')
-                return GetEnumName(rtType, ToUInt64(value));
+                return GetEnumName(rtType, ToUInt64(value)) ?? value.ToString();
 
             if (formatCh == 'D' || formatCh == 'd')
                 return value.ToString();