diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm index 5fed44e18a45..32b0798926de 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm @@ -209,7 +209,8 @@ - (LinesMeasurements)getLinesForAttributedString:(facebook::react::AttributedStr CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y; auto line = LineMeasurement{ - std::string([renderedString UTF8String]), + std::string( + [renderedString UTF8String] != nullptr ? [renderedString UTF8String] : ""), rect, overallRect.size.height - baseline, font.capHeight, diff --git a/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm b/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm index 38e76af812f3..ae98c0752cf4 100644 --- a/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm +++ b/packages/rn-tester/NativeComponentExample/ios/RNTMyNativeViewCommon.mm @@ -11,7 +11,8 @@ @implementation UIView (ColorOverlays) - (void)setBackgroundColorWithColorString:(NSString *)colorString { - UIColor *color = [UIView UIColorFromHexString:std::string([colorString UTF8String])]; + const char *colorUTF8 = [colorString UTF8String]; + UIColor *color = [UIView UIColorFromHexString:std::string(colorUTF8 != nullptr ? colorUTF8 : "")]; self.backgroundColor = color; } @@ -23,7 +24,8 @@ - (void)addColorOverlays:(const NSArray *)overlayColors id colorString = [overlayColors objectAtIndex:i]; CGRect rect = CGRectMake(viewBounds.origin.x + width * i, viewBounds.origin.y, width, viewBounds.size.height); UIView *overlayView = [[UIView alloc] initWithFrame:rect]; - UIColor *color = [UIView UIColorFromHexString:std::string([colorString UTF8String])]; + const char *colorUTF8 = [colorString UTF8String]; + UIColor *color = [UIView UIColorFromHexString:std::string(colorUTF8 != nullptr ? colorUTF8 : "")]; overlayView.backgroundColor = color; [self addSubview:overlayView]; }