Skip to content

Fix Text truncation at NULL character on iOS and Android (#24129) #57906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kulkarni-rohan wants to merge 1 commit into from
Closed

Fix Text truncation at NULL character on iOS and Android (#24129) #57906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions packages/react-native/React/Fabric/RCTConversions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ inline NSString *RCTNSStringFromString(
const std::string &string,
const NSStringEncoding &encoding = NSUTF8StringEncoding)
{
return [NSString stringWithCString:string.c_str() encoding:encoding] ?: @"";
return [[NSString alloc] initWithBytes:string.data()
length:string.size()
encoding:encoding] ?: @"";
}

inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty(
Expand All @@ -46,7 +48,14 @@ inline NSString *_Nullable RCTNSStringFromStringNilIfEmpty(

inline std::string RCTStringFromNSString(NSString *string)
{
return std::string{string.UTF8String ?: ""};
if (!string) {
return "";
}
NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding];
if (!data) {
return "";
}
return std::string{(const char *)data.bytes, data.length};
}

inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)
Expand Down
19 changes: 12 additions & 7 deletions ...tive/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<const jchar*>(utf16.data()),
static_cast<jsize>(utf16.size())));
} else if (type == "Lcom/facebook/react/bridge/Callback;") {
if (!(arg->isObject() && arg->getObject(rt).isFunction(rt))) {
throw JavaTurboModuleArgumentConversionException(
Expand Down Expand Up @@ -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<const char16_t*>(chars),
static_cast<size_t>(length));
env->ReleaseStringChars(returnString, chars);
returnValue = jsi::Value(runtime, jsiString);
}

TMPL::syncMethodCallReturnConversionEnd(moduleName, methodName);
Expand Down
5 changes: 4 additions & 1 deletion ...act-native/ReactCommon/react/nativemodule/core/platform/ios/ReactCommon/RCTTurboModule.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ size_t size() const override

static NSString *convertJSIStringToNSString(jsi::Runtime &runtime, const jsi::String &value)
{
return [NSString stringWithUTF8String:value.utf8(runtime).c_str()];
auto utf8 = value.utf8(runtime);
return [[NSString alloc] initWithBytes:utf8.data()
length:utf8.size()
encoding:NSUTF8StringEncoding] ?: @"";
}

static NSArray *convertJSIArrayToNSArray(
Expand Down
4 changes: 3 additions & 1 deletion ...textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,9 @@ void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)

return [[NSMutableAttributedString attributedStringWithAttachment:attachment] mutableCopy];
} else {
NSString *string = [NSString stringWithUTF8String:fragment.string.c_str()];
NSString *string = [[NSString alloc] initWithBytes:fragment.string.data()
length:fragment.string.size()
encoding:NSUTF8StringEncoding] ?: @"";

if (fragment.textAttributes.textTransform.has_value()) {
auto textTransform = fragment.textAttributes.textTransform.value();
Expand Down
7 changes: 5 additions & 2 deletions ...r/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTTextLayoutManager.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,9 +400,12 @@ - (LinesMeasurements)getLinesForAttributedString:(facebook::react::AttributedStr
.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 ? (const char *)renderedData.bytes : "",
renderedData ? renderedData.length : 0),
rect,
overallRect.size.height - baseline,
font.capHeight,
Expand Down