From 4b95bb2f842594214ba6e856f292bbf05701332c Mon Sep 17 00:00:00 2001 From: Samuel Susla Date: Tue, 8 Sep 2020 10:27:17 -0700 Subject: [PATCH] Check for nullability of [NSString UTF8String] Summary: Changelog: [internal] [NSString UTF8String] is nullable. Therefore, we need to check if it isn't nil before passing it to std::string constructor which crashes if it's nil. Reviewed By: shergin Differential Revision: D23572652 fbshipit-source-id: 59e7f5e918b2e5c69333bfb687371f856555d8e0 --- React/Fabric/RCTConversions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h index 29e7aff75d6..f1dc7ee2910 100644 --- a/React/Fabric/RCTConversions.h +++ b/React/Fabric/RCTConversions.h @@ -32,7 +32,7 @@ inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty( inline std::string RCTStringFromNSString(NSString *string) { - return string ? std::string([string UTF8String]) : ""; + return std::string{string.UTF8String ?: ""}; } inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)