Skip to content

[0.83] Fix multiline TextInput crash from TxDrawD2D reentrancy (#15990) #16004

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

Merged
iamAbhi-916 merged 1 commit into from
Apr 16, 2026
Merged

[0.83] Fix multiline TextInput crash from TxDrawD2D reentrancy (#15990) #16004

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
7 changes: 7 additions & 0 deletions change/react-native-windows-fd21e9f2-3f90-4b4a-94f5-fbf8802080dc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Fix multiline TextInput crash from TxDrawD2D reentrancy",
"packageName": "react-native-windows",
"email": "74712637+iamAbhi-916@users.noreply.github.com",
"dependentChangeType": "patch"
}
3 changes: 3 additions & 0 deletions vnext/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1780,7 +1780,10 @@ void WindowsTextInputComponentView::DrawText() noexcept {
}

// TODO keep track of proper invalid rect
// Prevent reentrancy: TxDrawD2D may call TxViewChange -> DrawText
m_cDrawBlock++;
auto hrDraw = m_textServices->TxDrawD2D(d2dDeviceContext, &rc, nullptr, TXTVIEW_ACTIVE);
m_cDrawBlock--;
winrt::check_hresult(hrDraw);

// draw placeholder text if needed
Expand Down
Loading