Skip to content

Fix potential NPE in UIViewOperationQueue. #11428

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
manicakes wants to merge 6 commits into from
Closed

Fix potential NPE in UIViewOperationQueue. #11428

Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ad48cf2
Fix NPE when flushing UIViewOperationQueue.
Dec 12, 2016
f2290b3
Merge branch 'master' of https://github.com/facebook/react-native int…
Dec 16, 2016
305cc0b
revert null checks on execute, do null check on enqueue
Dec 21, 2016
0f92b80
Merge branch 'master' into android_uiviewoperationqueue_npe
Dec 25, 2016
c7f6ed0
Merge branch 'master' of https://github.com/facebook/react-native int…
Jan 30, 2017
a739611
Update based on @astreet comments
Jan 30, 2017
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
8 changes: 5 additions & 3 deletions ReactAndroid/src/main/java/com/facebook/react/uimanager/UIViewOperationQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,9 @@ public void run() {
* subclass to support UIOperations not provided by UIViewOperationQueue.
*/
protected void enqueueUIOperation(UIOperation operation) {
mOperations.add(operation);
if (operation != null) {
mOperations.add(operation);
}
}

public void enqueueRemoveRootView(int rootViewTag) {
Expand Down Expand Up @@ -778,8 +780,8 @@ public void run() {
}

@astreet astreet Jan 24, 2017

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove this change since it's not relevant.

if (operations != null) {
for (int i = 0; i < operations.size(); i++) {
operations.get(i).execute();
for (UIOperation op : operations) {
op.execute();
}
}

Expand Down