Fixed data race issue inside GCDWebServerGetMimeTypeForExtension()

swisspol · swisspol · commit a013f9cebbf6 · 2017-06-24T09:30:39.000-07:00
Fix swisspol#312
diff --git a/GCDWebServer/Core/GCDWebServerFunctions.m b/GCDWebServer/Core/GCDWebServerFunctions.m
@@ -167,16 +167,11 @@ BOOL GCDWebServerIsTextContentType(NSString* type) {
 }
 
 NSString* GCDWebServerGetMimeTypeForExtension(NSString* extension) {
-  static NSDictionary* _overrides = nil;
-  if (_overrides == nil) {
-    _overrides = [[NSDictionary alloc] initWithObjectsAndKeys:
-                                           @"text/css", @"css",
-                                           nil];
-  }
+  NSDictionary* overrides = @{@"css": @"text/css"};
   NSString* mimeType = nil;
   extension = [extension lowercaseString];
   if (extension.length) {
-    mimeType = [_overrides objectForKey:extension];
+    mimeType = [overrides objectForKey:extension];
     if (mimeType == nil) {
       CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)extension, NULL);
       if (uti) {
