Changeset 243168 in webkit

Timestamp:

Mar 19, 2019, 1:35:14 PM (7 years ago)

Author:

Conrad Shultz

Message:

REGRESSION (r242369): Only use picker-supported UTIs when creating image picker
​https://bugs.webkit.org/show_bug.cgi?id=195955

Reviewed by Chris Dumez and Wenson Hsieh.

r242369 started passing UTIs to -[UIImagePickerController setMediaTypes:] that correspond to types accepted by the
file input element. However, UIImagePickerController expects a specific subset of UTIs. In the worst case, if no
expected types are passed, this can cause a crash.

• UIProcess/ios/forms/WKFileUploadPanel.mm:

(UTIsForMIMETypes):
Return a set rather than an array.
(-[WKFileUploadPanel _mediaTypesForPickerSourceType:]):
Rather than hardcode specific UTIs, ask UIImagePickerController for its available types. If an accepted type
is in the list of available types, use it. Otherwise, if an accepted type conforms to an available type,
use the available type. This is an O(n^{2) process, but there typically are only a handful of types, so
this seems acceptable.
(-[WKFileUploadPanel _showDocumentPickerMenu]):
Convert the set from UTIsForMIMETypes() to an array.}

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ios/forms/WKFileUploadPanel.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-19  Conrad Shultz  <conrad_shultz@apple.com>
+
+        REGRESSION (r242369): Only use picker-supported UTIs when creating image picker
+        https://bugs.webkit.org/show_bug.cgi?id=195955
+
+        Reviewed by Chris Dumez and Wenson Hsieh.
+
+        r242369 started passing UTIs to -[UIImagePickerController setMediaTypes:] that correspond to types accepted by the
+        file input element. However, UIImagePickerController expects a specific subset of UTIs. In the worst case, if no
+        expected types are passed, this can cause a crash.
+
+        * UIProcess/ios/forms/WKFileUploadPanel.mm:
+        (UTIsForMIMETypes):
+        Return a set rather than an array.
+        (-[WKFileUploadPanel _mediaTypesForPickerSourceType:]):
+        Rather than hardcode specific UTIs, ask UIImagePickerController for its available types. If an accepted type
+        is in the list of available types, use it. Otherwise, if an accepted type conforms to an available type,
+        use the available type. This is an O(n^2) process, but there typically are only a handful of types, so
+        this seems acceptable.
+        (-[WKFileUploadPanel _showDocumentPickerMenu]):
+        Convert the set from UTIsForMIMETypes() to an array.
+
 2019-03-19  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/UIProcess/ios/forms/WKFileUploadPanel.mm

@@ -315 +315 @@
 #pragma mark - Media Types
 
-static NSArray *UTIsForMIMETypes(NSArray *mimeTypes)
+static NSSet<NSString *> *UTIsForMIMETypes(NSArray *mimeTypes)
 {
     NSMutableSet *mediaTypes = [NSMutableSet set];
@@ -323 +323 @@
             [mediaTypes addObject:(__bridge NSString *)uti];
     }
-    return mediaTypes.allObjects;
-}
-
-- (NSArray *)_mediaTypesForPickerSourceType:(UIImagePickerControllerSourceType)sourceType
-{
-    NSArray *mediaTypes = UTIsForMIMETypes(_mimeTypes.get());
-    if (mediaTypes.count)
+    return mediaTypes;
+}
+
+- (NSArray<NSString *> *)_mediaTypesForPickerSourceType:(UIImagePickerControllerSourceType)sourceType
+{
+    NSArray<NSString *> *availableMediaTypes = [UIImagePickerController availableMediaTypesForSourceType:sourceType];
+    NSSet<NSString *> *acceptedMediaTypes = UTIsForMIMETypes(_mimeTypes.get());
+    if (acceptedMediaTypes.count) {
+        NSMutableArray<NSString *> *mediaTypes = [NSMutableArray array];
+        for (NSString *availableMediaType in availableMediaTypes) {
+            if ([acceptedMediaTypes containsObject:availableMediaType])
+                [mediaTypes addObject:availableMediaType];
+            else {
+                for (NSString *acceptedMediaType in acceptedMediaTypes) {
+                    if (UTTypeConformsTo((__bridge CFStringRef)acceptedMediaType, (__bridge CFStringRef)availableMediaType)) {
+                        [mediaTypes addObject:availableMediaType];
+                        break;
+                    }
+                }
+            }
+        }
         return mediaTypes;
+    }
 
     // Fallback to every supported media type if there is no filter.
-    return [UIImagePickerController availableMediaTypesForSourceType:sourceType];
+    return availableMediaTypes;
 }
 
@@ -357 +372 @@
 - (void)_showDocumentPickerMenu
 {
-    NSArray *mediaTypes = UTIsForMIMETypes(_mimeTypes.get());
+    NSArray *mediaTypes = UTIsForMIMETypes(_mimeTypes.get()).allObjects;
 
     BOOL containsImageMediaType = !mediaTypes.count || arrayContainsUTIThatConformsTo(mediaTypes, kUTTypeImage);