Fix null dereference in onRemove when container is detached - #561
Open
cpruijsen wants to merge 1 commit into
Open
Fix null dereference in onRemove when container is detached#561cpruijsen wants to merge 1 commit into
cpruijsen wants to merge 1 commit into
Conversation
When a map is removed before the geocoder control is removed (e.g. map.remove() followed by map.removeControl(geocoder)), the geocoder's container is already detached from the DOM and parentNode is null, causing a TypeError on removeChild. Guard the removal so onRemove is safe to call after the container has been detached. Fixes mapbox#480
|
OX Security reviewed this pull request — nothing to fix.
Branch |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
onRemovethrows when the geocoder's container is no longer in the DOM.lib/index.jscallsthis.container.parentNode.removeChild(...)unconditionally, andparentNodeis null once somethingelse has already detached the container. Removing the map first does exactly that, so the ordinary
teardown order of map then control throws on the second step.
This checks
parentNodebefore removing. A container with no parent needs no removal, so there isnothing to do in that case and the rest of the teardown, the
moveendhandler and the marker,continues rather than being skipped by the throw.
The test removes the map and asserts
onRemovedoes not throw.Fixes #480