fix(ios): avoid zero size crash when using UIGraphics api in debug mode

Tencent · May 10, 2024 · 48573ef · 48573ef
1 parent 0aa7901
commit 48573ef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/ios/sdk/component/view/HippyView.m b/ios/sdk/component/view/HippyView.m
@@ -642,6 +642,11 @@ - (BOOL)getLayerContentForColor:(UIColor *)color completionBlock:(void (^)(UIIma
         return YES;
     }
     else if (self.backgroundImageUrl) {
+        CGSize size = theFrame.size;
+        if (0 >= size.width || 0 >= size.height) {
+            contentBlock(nil);
+            return YES;
+        }
         CGFloat backgroundPositionX = self.backgroundPositionX;
         CGFloat backgroundPositionY = self.backgroundPositionY;
         HippyBackgroundImageCacheManager *weakBackgroundCacheManager = [self backgroundCachemanager];

diff --git a/ios/sdk/debug/devtools/inspector/model/HippyPageModel.m b/ios/sdk/debug/devtools/inspector/model/HippyPageModel.m
@@ -110,6 +110,7 @@ - (BOOL)screencastJSONWithManager:(HippyUIManager *)manager
         if (!rootView) {
             HippyLogWarn(@"PageModel, screen cast, root view is nil");
             completion(@{});
+            return;
         }
         CGFloat viewWidth = rootView.frame.size.width;
         CGFloat viewHeight = rootView.frame.size.height;
@@ -118,6 +119,10 @@ - (BOOL)screencastJSONWithManager:(HippyUIManager *)manager
             CGFloat scaleX = self.maxSize.width / viewWidth;
             CGFloat scaleY = self.maxSize.height / viewHeight;
             scale = MIN(scaleX, scaleY);
+        } else {
+            HippyLogWarn(@"PageModel, screen cast, root view size is 0");
+            completion(@{});
+            return;
         }
         // root view snapshot
         UIGraphicsBeginImageContextWithOptions(rootView.frame.size, NO, scale);
@@ -141,8 +146,7 @@ - (BOOL)screencastJSONWithManager:(HippyUIManager *)manager
             resultJSON[HippyPageKeySessionId] = @(timestamp);
             self.lastTimestamp = timestamp;
             completion(resultJSON);
-        }
-        else {
+        } else {
             completion(@{});
         }
     });