[image_picker] Fix If imageToScale is nil, the app will crash (#14668…

…2) (#6514) Fix flutter/flutter#146682 Pre-launch Checklist
flutter · Apr 22, 2024 · 8857221 · 8857221
1 parent cb89e65
commit 8857221
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 1 deletion.
diff --git a/packages/image_picker/image_picker_ios/CHANGELOG.md b/packages/image_picker/image_picker_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.8.10+1
+
+* Fixes a possible crash when calling a picker method UIGraphicsImageRenderer if imageToScale is nil.
+
 ## 0.8.10
 
 * Adds limit parameter to `MediaOptions` and `MultiImagePickerOptions` that sets a limit to how many media or image items can be selected.

diff --git a/packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImageUtilTests.m b/packages/image_picker/image_picker_ios/example/ios/RunnerTests/ImageUtilTests.m
@@ -217,4 +217,24 @@ - (void)testScaledImage_WideImage_ShouldNotBeScaledAboveOriginaWidthOrHeight {
   XCTAssertEqual(newImage.size.height, 7);
 }
 
+- (void)testScaledImage_ImageIsNil {
+  UIImage *image = nil;
+  UIImage *newImage = [FLTImagePickerImageUtil scaledImage:image
+                                                  maxWidth:@1440
+                                                 maxHeight:@1440
+                                       isMetadataAvailable:YES];
+
+  XCTAssertEqual(newImage, nil);
+}
+
+- (void)testScaledImage_ImageMaxWidthZeroAndMaxHeightIsZero {
+  UIImage *image = [UIImage imageWithData:ImagePickerTestImages.JPGTestData];
+  UIImage *newImage = [FLTImagePickerImageUtil scaledImage:image
+                                                  maxWidth:@0
+                                                 maxHeight:@0
+                                       isMetadataAvailable:YES];
+
+  XCTAssertEqual(newImage, nil);
+}
+
 @end
diff --git a/packages/image_picker/image_picker_ios/ios/Classes/FLTImagePickerImageUtil.m b/packages/image_picker/image_picker_ios/ios/Classes/FLTImagePickerImageUtil.m
@@ -29,6 +29,9 @@ - (instancetype)initWithImages:(NSArray<UIImage *> *)images interval:(NSTimeInte
 @implementation FLTImagePickerImageUtil : NSObject
 
 static UIImage *FLTImagePickerDrawScaledImage(UIImage *imageToScale, double width, double height) {
+  if (imageToScale == nil || width == 0 || height == 0) {
+    return nil;
+  }
   UIGraphicsImageRenderer *imageRenderer =
       [[UIGraphicsImageRenderer alloc] initWithSize:CGSizeMake(width, height)
                                              format:imageToScale.imageRendererFormat];

diff --git a/packages/image_picker/image_picker_ios/pubspec.yaml b/packages/image_picker/image_picker_ios/pubspec.yaml
@@ -2,7 +2,7 @@ name: image_picker_ios
 description: iOS implementation of the image_picker plugin.
 repository: https://github.com/flutter/packages/tree/main/packages/image_picker/image_picker_ios
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+image_picker%22
-version: 0.8.10
+version: 0.8.10+1
 
 environment:
   sdk: ^3.3.0