Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deferred tree deletion needs to take non-managed trees into account

Browse Source 
Summary:
Crashes can occur if we try to disassemble trees not managed by React Native - for example a native component tree, Litho hierarchies, etc.

As we disassemble the tree, ensure that children are managed before disassembling a subtree.

Changelog: [Internal]

Reviewed By: ryancat

Differential Revision: D37493854

fbshipit-source-id: fee4d303133edcef663abfe8637bce6b24627724
This commit is contained in:
Joshua Gross
2022-06-28 16:13:07 -07:00
committed by Facebook GitHub Bot
parent 3a7170ca52
commit 297b571005
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/SurfaceMountingManager.java
+33 -8
View File
@@ -1430,23 +1430,48 @@ public class SurfaceMountingManager {
if (thisViewState != null) {
View thisView = thisViewState.mView;
int numChildren = 0;
// Children are managed by React Native if both of the following are true:
// 1) There are 1 or more children of this View, which must be a ViewGroup
// 2) Those children are managed by RN (this is not the case for certain native
// components, like embedded Litho hierarchies)
boolean childrenAreManaged = false;
if (thisView instanceof ViewGroup) {
View nextChild = null;
// For reasons documented elsewhere in this class, getChildCount is not
// necessarily
// reliable, and so we rely instead on requesting children directly.
// necessarily reliable, and so we rely instead on requesting children directly.
while ((nextChild = ((ViewGroup) thisView).getChildAt(numChildren)) != null) {
if (numChildren == 0) {
// Push tag onto the stack so we reprocess it after all children
mReactTagsToRemove.push(reactTag);
}
int childId = nextChild.getId();
childrenAreManaged = childrenAreManaged || getNullableViewState(childId) != null;
mReactTagsToRemove.push(nextChild.getId());
numChildren++;
}
// Removing all at once is more efficient than removing one-by-one
((ViewGroup) thisView).removeAllViews();
// If the children are not managed by RN, we simply drop the entire
// subtree instead of recursing further.
if (childrenAreManaged) {
try {
// This can happen if the removeAllViews method is overriden to throw,
// which it is explicitly in some cases (for example embedded Litho views,
// but there could be other cases). In those cases, we want to fail silently
// and then assume the subtree is /not/ managed by React Native.
// In this case short-lived memory-leaks could occur if we aren't clearing
// out the ViewState map properly; but the risk should be small.
// In debug mode, the SoftException will cause a crash. In production it
// will not. This should give good visibility into whether or not this is
// a problem without causing user-facing errors.
((ViewGroup) thisView).removeAllViews();
} catch (RuntimeException e) {
childrenAreManaged = false;
ReactSoftExceptionLogger.logSoftException(TAG, e);
}
}
}
if (numChildren == 0) {
if (childrenAreManaged) {
// Push tag onto the stack so we reprocess it after all children
mReactTagsToRemove.push(reactTag);
} else {
mTagToViewState.remove(reactTag);
onViewStateDeleted(thisViewState);
}