Skip to content

merge v1.x into master - #1582

Merged
Fishrock123 merged 4 commits into
nodejs:masterfrom
Fishrock123:master-with-v1.x-merge
May 2, 2015
Merged

merge v1.x into master#1582
Fishrock123 merged 4 commits into
nodejs:masterfrom
Fishrock123:master-with-v1.x-merge

Conversation

@Fishrock123

Copy link
Copy Markdown
Contributor

replacement for #1559

This also adds the "Working on v1.8.2" commit.

R=@chrisdickinson

chrisdickinsonand others added 3 commits April 20, 2015 16:02
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>
@Fishrock123Fishrock123 added this to the 2.0.0 milestone May 1, 2015
@mscdexmscdex added the meta Issues and PRs related to the general management of the project. label May 1, 2015
@chrisdickinson

Copy link
Copy Markdown
Contributor

LGTM.

PR-URL: nodejs#1582
Reviewed-By: Chris Dickinson <christopher.s.dickinson@gmail.com>
Conflicts:
src/node_version.h
@Fishrock123Fishrock123 mentioned this pull request May 2, 2015
@Fishrock123
Fishrock123force-pushed the master-with-v1.x-merge branch from daa05ca to 79a7a86CompareMay 2, 2015 00:12
@Fishrock123
Fishrock123 merged commit 79a7a86 into nodejs:masterMay 2, 2015
@rvaggrvagg mentioned this pull request May 2, 2015
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

metaIssues and PRs related to the general management of the project.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@Fishrock123@chrisdickinson@mscdex@trevnorris@indutny