Merge pull request #823 from microsoft/dev

Fix the issue #821: PublicKeyToken parsing doesn't handle not strong named assembly
microsoft · Nov 12, 2019 · d5e366f · d5e366f
2 parents 65d5dc8 + df36fb5
commit d5e366f
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/lib/Microsoft.Fx.Portability/Analyzer/PublicKeyToken.cs b/src/lib/Microsoft.Fx.Portability/Analyzer/PublicKeyToken.cs
@@ -46,6 +46,9 @@ public bool Equals(PublicKeyToken other)
 
         public override int GetHashCode()
         {
+            if (Token.IsEmpty)
+                return 0;
+
             int hash = 19;
             unchecked
             {
@@ -83,6 +86,9 @@ public override string ToString()
 
         private static ImmutableArray<byte> ParseString(string hex)
         {
+            if ((string.Compare(hex, "null", true, CultureInfo.InvariantCulture) == 0) || hex == null)
+                return ImmutableArray<byte>.Empty;
+
             if (hex.Length % 2 != 0)
             {
                 throw new PortabilityAnalyzerException(string.Format(CultureInfo.InvariantCulture, LocalizedStrings.InvalidPublicKeyToken, hex));