diff --git a/packages/react-native/React/Fabric/RCTConversions.h b/packages/react-native/React/Fabric/RCTConversions.h index 21e6310c62b..d4f705c82b6 100644 --- a/packages/react-native/React/Fabric/RCTConversions.h +++ b/packages/react-native/React/Fabric/RCTConversions.h @@ -34,7 +34,8 @@ inline NSString *RCTNSStringFromString( const std::string &string, const NSStringEncoding &encoding = NSUTF8StringEncoding) { - return [NSString stringWithCString:string.c_str() encoding:encoding] ?: @""; + NSString *result = [[NSString alloc] initWithBytes:string.data() length:string.size() encoding:encoding]; + return result != nil ? result : @""; } inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty( @@ -46,7 +47,14 @@ inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty( inline std::string RCTStringFromNSString(NSString *string) { - return std::string{string.UTF8String ?: ""}; + if (string == nil) { + return ""; + } + NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding]; + if (data == nil) { + return ""; + } + return std::string{static_cast(data.bytes), data.length}; } inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor) diff --git a/packages/react-native/React/Tests/Text/RCTAttributedTextUtilsTest.mm b/packages/react-native/React/Tests/Text/RCTAttributedTextUtilsTest.mm index e14c46fd528..a02622d5d7d 100644 --- a/packages/react-native/React/Tests/Text/RCTAttributedTextUtilsTest.mm +++ b/packages/react-native/React/Tests/Text/RCTAttributedTextUtilsTest.mm @@ -9,12 +9,14 @@ #import #import +#import #import #import #include #include +#include #include using namespace facebook::react; @@ -384,4 +386,56 @@ static NSDictionary *FontVariationsFromSettings(std::opt attributedString2, attributedString1, insensitiveAttributes, textAttributes)); } +// A std::string may legitimately contain an embedded NUL. The C-string APIs +// these converters used to call stop at it, silently truncating user text. + +- (void)testNSStringFromStringPreservesEmbeddedNull +{ + std::string withNull("Hello\0World", 11); + XCTAssertEqual(withNull.size(), 11u); + + NSString *converted = RCTNSStringFromString(withNull); + + XCTAssertEqual(converted.length, 11u); + XCTAssertTrue([converted hasPrefix:@"Hello"]); + XCTAssertTrue([converted hasSuffix:@"World"]); +} + +- (void)testStringFromNSStringPreservesEmbeddedNull +{ + std::array chars{'a', 0, 'b'}; + NSString *withNull = [NSString stringWithCharacters:chars.data() length:chars.size()]; + XCTAssertEqual(withNull.length, 3u); + + std::string converted = RCTStringFromNSString(withNull); + + XCTAssertEqual(converted.size(), 3u); + XCTAssertEqual(converted[0], 'a'); + XCTAssertEqual(converted[1], '\0'); + XCTAssertEqual(converted[2], 'b'); +} + +- (void)testStringConversionRoundTripsEmbeddedNull +{ + std::string original("A\0B\0C", 5); + + std::string roundTripped = RCTStringFromNSString(RCTNSStringFromString(original)); + + XCTAssertEqual(roundTripped.size(), original.size()); + XCTAssertTrue(roundTripped == original); +} + +- (void)testAttributedStringFromFragmentPreservesEmbeddedNull +{ + AttributedString attributedString; + AttributedString::Fragment fragment; + fragment.string = std::string("Hello\0World", 11); + attributedString.appendFragment(std::move(fragment)); + + NSAttributedString *result = RCTNSAttributedStringFromAttributedString(attributedString); + + XCTAssertEqual(result.string.length, 11u); + XCTAssertTrue([result.string hasSuffix:@"World"]); +} + @end diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp index 944b59c4f49..cec9eaf5f02 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp @@ -406,8 +406,10 @@ JNIArgs convertJSIArgsToJNIArgs( throw JavaTurboModuleArgumentConversionException( "string", argIndex, methodName, arg, &rt); } - jarg->l = makeGlobalIfNecessary( - env->NewStringUTF(arg->getString(rt).utf8(rt).c_str())); + auto utf16 = rt.utf16(arg->getString(rt)); + jarg->l = makeGlobalIfNecessary(env->NewString( + reinterpret_cast(utf16.data()), + static_cast(utf16.size()))); } else if (type == "Lcom/facebook/react/bridge/Callback;") { if (!(arg->isObject() && arg->getObject(rt).isFunction(rt))) { throw JavaTurboModuleArgumentConversionException( @@ -785,11 +787,14 @@ jsi::Value JavaTurboModule::invokeJavaMethod( jsi::Value returnValue = jsi::Value::null(); if (returnString != nullptr) { - const char* js = env->GetStringUTFChars(returnString, nullptr); - std::string result = js; - env->ReleaseStringUTFChars(returnString, js); - returnValue = - jsi::Value(runtime, jsi::String::createFromUtf8(runtime, result)); + jsize length = env->GetStringLength(returnString); + const jchar* chars = env->GetStringChars(returnString, nullptr); + auto jsiString = jsi::String::createFromUtf16( + runtime, + reinterpret_cast(chars), + static_cast(length)); + env->ReleaseStringChars(returnString, chars); + returnValue = jsi::Value(runtime, jsiString); } TMPL::syncMethodCallReturnConversionEnd(moduleName, methodName); diff --git a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm index ac075393452..3da49c39a08 100644 --- a/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm +++ b/packages/react-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm @@ -143,7 +143,9 @@ jsi::Value convertObjCObjectToJSIValue(jsi::Runtime &runtime, id value) static NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value) { - return [NSString stringWithUTF8String:value.utf8(runtime).c_str()]; + auto utf8 = value.utf8(runtime); + NSString *result = [[NSString alloc] initWithBytes:utf8.data() length:utf8.size() encoding:NSUTF8StringEncoding]; + return result != nil ? result : @""; } static NSArray *convertJSIArrayToNSArray( diff --git a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm index 346ff459dd2..95ff5a0d180 100644 --- a/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm +++ b/packages/react-native/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm @@ -417,7 +417,10 @@ static NSMutableAttributedString *RCTNSAttributedStringFragmentFromFragment( return [[NSMutableAttributedString attributedStringWithAttachment:attachment] mutableCopy]; } else { - NSString *string = [NSString stringWithUTF8String:fragment.string.c_str()]; + NSString *decoded = [[NSString alloc] initWithBytes:fragment.string.data() + length:fragment.string.size() + encoding:NSUTF8StringEncoding]; + NSString *string = decoded != nil ? decoded : @""; if (fragment.textAttributes.textTransform.has_value()) { auto textTransform = fragment.textAttributes.textTransform.value(); 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 ac9b63e1e5e..5f9847a398f 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 @@ -400,9 +400,11 @@ static NSLineBreakMode RCTNSLineBreakModeFromEllipsizeMode(EllipsizeMode ellipsi .width = usedRect.size.width, .height = usedRect.size.height}}; CGFloat baseline = [layoutManager locationForGlyphAtIndex:range.location].y; - const char *renderedUTF8 = [renderedString UTF8String]; + NSData *renderedData = [renderedString dataUsingEncoding:NSUTF8StringEncoding]; auto line = LineMeasurement{ - std::string(renderedUTF8 != nullptr ? renderedUTF8 : ""), + std::string( + renderedData != nil ? static_cast(renderedData.bytes) : "", + renderedData != nil ? renderedData.length : 0), rect, overallRect.size.height - baseline, font.capHeight,