소스 검색

Merge pull request #314 from Bond-009/fix303

Fixes possible NullReferenceException
Joshua M. Boniface 6 년 전
부모
커밋
77a15fe404
1개의 변경된 파일8개의 추가작업 그리고 5개의 파일을 삭제
  1. 8 5
      Emby.Server.Implementations/HttpServer/HttpResultFactory.cs

+ 8 - 5
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs

@@ -112,12 +112,15 @@ namespace Emby.Server.Implementations.HttpServer
         /// </summary>
         private IHasHeaders GetHttpResult(IRequest requestContext, byte[] content, string contentType, bool addCachePrevention, IDictionary<string, string> responseHeaders = null)
         {
-            IHasHeaders result;
-
-            var compressionType = requestContext == null ? null : GetCompressionType(requestContext, content, contentType);
+            string compressionType = null;
+            bool isHeadRequest = false;
 
-            var isHeadRequest = string.Equals(requestContext.Verb, "head", StringComparison.OrdinalIgnoreCase);
+            if (requestContext != null) {
+                compressionType = GetCompressionType(requestContext, content, contentType);
+                isHeadRequest = string.Equals(requestContext.Verb, "head", StringComparison.OrdinalIgnoreCase);
+            }
 
+            IHasHeaders result;
             if (string.IsNullOrEmpty(compressionType))
             {
                 var contentLength = content.Length;
@@ -791,4 +794,4 @@ namespace Emby.Server.Implementations.HttpServer
     {
         byte[] Compress(byte[] content);
     }
-}
+}