Changeset 263880 in webkit

Timestamp:

Jul 2, 2020, 8:19:55 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

MIMETypeRegistry::getExtensionsForMIMEType() needs to handle wildcard MIME types
​https://bugs.webkit.org/show_bug.cgi?id=213826

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2020-07-02
Reviewed by Darin Adler.

Addressing post commit review comments for r263832.

• platform/cocoa/MIMETypeRegistryCocoa.mm:

(WebCore::extensionsForMIMETypeMap):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/cocoa/MIMETypeRegistryCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-07-02  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        MIMETypeRegistry::getExtensionsForMIMEType() needs to handle wildcard MIME types
+        https://bugs.webkit.org/show_bug.cgi?id=213826
+
+        Reviewed by Darin Adler.
+
+        Addressing post commit review comments for r263832.
+
+        * platform/cocoa/MIMETypeRegistryCocoa.mm:
+        (WebCore::extensionsForMIMETypeMap):
+
 2020-07-02  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/platform/cocoa/MIMETypeRegistryCocoa.mm

@@ -47 +47 @@
 
             ASSERT(pos != notFound);
-            auto wildcardMIMEType = makeString(type.left(pos), "/*"_s);
+            auto wildcardMIMEType = makeString(StringView(type).left(pos), "/*"_s);
 
             for (NSString *extension in extensions) {
-                if (!extension)
-                    continue;
-
                 // Add extension to wildcardMIMEType, for example add "png" to "image/*"
                 addExtension(wildcardMIMEType, extension);
@@ -60 +57 @@
         };
 
-        auto allUTIs = adoptNS((__bridge NSArray<NSString *> *)_UTCopyDeclaredTypeIdentifiers());
+        auto allUTIs = adoptCF(_UTCopyDeclaredTypeIdentifiers());
 
-        for (NSString *uti in allUTIs.get()) {
+        for (NSString *uti in (__bridge NSArray<NSString *> *)allUTIs.get()) {
             auto type = adoptCF(UTTypeCopyPreferredTagWithClass((__bridge CFStringRef)uti, kUTTagClassMIMEType));
             if (!type)