Merge pull request #780 from jeschu1/nullref2

devops: don't null ref when ContentType is null
microsoft · Oct 9, 2018 · f58ec17 · f58ec17
2 parents 906745d + 81fd82d
commit f58ec17
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Microsoft.Alm.Authentication/Src/Network.cs b/Microsoft.Alm.Authentication/Src/Network.cs
@@ -687,7 +687,7 @@ public async Task SetContent(HttpContent content)
             if (content is null)
                 throw new ArgumentNullException(nameof(content));
 
-            if (content.Headers.ContentType.MediaType != null
+            if (content.Headers.ContentType?.MediaType != null
                 && (content.Headers.ContentType.MediaType.StartsWith("text/", StringComparison.OrdinalIgnoreCase)
                     || content.Headers.ContentType.MediaType.EndsWith("/json", StringComparison.OrdinalIgnoreCase)))
             {
@@ -755,7 +755,7 @@ public async Task SetContent(HttpContent content)
 
                 lock (_syncpoint)
                 {
-                    _mediaType = content.Headers.ContentType.MediaType;
+                    _mediaType = content.Headers.ContentType?.MediaType;
                     _byteArray = asBytes;
                 }
             }