merge v1.x into master #1582
Merged
merge v1.x into master #1582
Conversation
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
Buffer#copy() immediately does a ToObject() on the first argument before it checks if it's even an Object. This causes Object::HasIndexedPropertiesInExternalArrayData() to be run on nothing, triggering the segfault. Instead run HasInstance() on the args Value. Which will check if it's actually an Object, before checking if it contains data. Fixes: nodejs#1519 PR-URL: nodejs#1520 Reviewed-by: Evan Lucas <evanlucas@me.com>
PR-URL: nodejs#1517 Reviewed-By: Brian White <mscdex@mscdex.net>
mscdex
added
the
meta
Contributor
|
LGTM. |
PR-URL: nodejs#1582 Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com> Conflicts: src/node_version.h
Closed
Fishrock123
force-pushed
the
master-with-v1.x-merge
branch
from
daa05ca to
79a7a86
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
replacement for #1559
This also adds the "Working on v1.8.2" commit.
R=@chrisdickinson