Fix react-dom/server context leaks when render stream destroyed early #14706
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
2nd test added for #14705 (comment). |
overlookmotel
changed the title
matthargett
approved these changes
Jan 29, 2019
gaearon
requested changes
Feb 13, 2019
| @@ -776,6 +777,16 @@ class ReactDOMServerRenderer { | |||
| context[this.threadID] = previousValue; | |||
| } | |||
|
|
|||
| clearProviders(): void { | |||
| while (this.contextIndex > -1) { | |||
| if (__DEV__) { | |||
There was a problem hiding this comment.
Can you write the loop inline with minimal work it needs to do? For example reading previous value seems unnecessary except for the last one. This would also avoid the overloading you had to add to popProvider.
There was a problem hiding this comment.
I've pushed another commit which does as you request.
However, the previous value does need to be restored for each Provider, as each Context's current value is stored separately on each Context object.
Well, if there were several nested Providers for the same Context, then yes you could only restore just the last previous value. But I don't think this would be more performative, as clearProviders() would need to loop over the array twice - once to identify any repeated contexts, and then a 2nd time to restore whatever was the oldest previous value for each Context.
I think it's probably cheaper to redundantly write the value multiple times in these cases.
But if you want further changes, please just say so and I'll implement.
There was a problem hiding this comment.
NB This leaves contextStack and contextValueStack unaltered, and so retaining memory. But I guess since the PartialRenderer instance has been destroyed, it will be dereferenced and garbage collected shortly anyway.
overlookmotel
force-pushed
the
fix-reactdom-server-context-memory-retention
branch
from
8088074
to
94f70f5
Compare
|
ReactDOM: size: 0.0%, gzip: -0.0% Details of bundled changes.Comparing: 08e9554...855cc27 react-dom
Generated by 🚫 dangerJS |
gaearon
approved these changes
Feb 14, 2019
|
Thank you! |
overlookmotel
deleted the
fix-reactdom-server-context-memory-retention
branch
acdlite
pushed a commit
to acdlite/react
that referenced
this pull request
Feb 20, 2019
…facebook#14706) * Fix react-dom/server context memory retention * Test for pollution of later renders * Inline loop * More tests
Deraen
added a commit
to cljsjs/packages
that referenced
this pull request
Mar 2, 2019
## 16.8.2 => 16.8.3 ### React DOM * Fix a bug that caused inputs to behave incorrectly in UMD builds. ([@gaearon](https://github.com/gaearon) in [#14914](facebook/react#14914)) * Fix a bug that caused render phase updates to be discarded. ([@gaearon](https://github.com/gaearon) in [#14852](facebook/react#14852)) ### React DOM Server * Unwind the context stack when a stream is destroyed without completing, to prevent incorrect values during a subsequent render. ([@overlookmotel](https://github.com/overlookmotel) in [#14706](facebook/react#14706))
Deraen
added a commit
to cljsjs/packages
that referenced
this pull request
Mar 2, 2019
## 16.8.2 => 16.8.3 ### React DOM * Fix a bug that caused inputs to behave incorrectly in UMD builds. ([@gaearon](https://github.com/gaearon) in [#14914](facebook/react#14914)) * Fix a bug that caused render phase updates to be discarded. ([@gaearon](https://github.com/gaearon) in [#14852](facebook/react#14852)) ### React DOM Server * Unwind the context stack when a stream is destroyed without completing, to prevent incorrect values during a subsequent render. ([@overlookmotel](https://github.com/overlookmotel) in [#14706](facebook/react#14706))
This was referenced Aug 12, 2019
This was referenced Sep 22, 2019
Open
[Snyk] Upgrade react-dom from 16.5.2 to 16.9.0
maxiplux/spring-security-react-ant-design-polls-app#3
Open
This was referenced Sep 30, 2019
Open
This was referenced Oct 17, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix and test case for #14705.
Note: This makes
.popProvider'sproviderargument optional. It's only used in dev mode anyway, but I'm not sure if this is the wrong thing to do. Please excuse me - I've never used Flow before.