Skip to content
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

Jump to bottom

src: make buffers 2**32 proof in node_buffers.cc #31591

Closed
wants to merge 3 commits into from
Closed

src: make buffers 2**32 proof in node_buffers.cc #31591

wants to merge 3 commits into from

Conversation

DavenportEmma
Copy link
Contributor

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added buffer Issues and PRs related to the buffer subsystem. c++ Issues and PRs that require attention from people who are familiar with C++. labels Jan 31, 2020
@DavenportEmma DavenportEmma changed the title Issue31514 src: make buffers 2**32 proof in node_buffers.cc Jan 31, 2020
addaleax
addaleax approved these changes Jan 31, 2020
View reviewed changes
Copy link
Member

@addaleax addaleax left a comment

Choose a reason for hiding this comment

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

LGTM with @jasnell’s nit

bnoordhuis
bnoordhuis approved these changes Feb 1, 2020
View reviewed changes
src/node_buffer.cc
size_t start;
THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, args[2], 0, &start));
size_t end;
THROW_AND_RETURN_IF_OOB(ParseArrayIndex(env, args[3], 0, &end));
Copy link
Member

Choose a reason for hiding this comment

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

If this is the only place that needs updating (a quick scan of node_buffer.cc suggests it is but can you double check?) then you can change the Refs: in your commit log to Fixes:.

Trott
Trott approved these changes Feb 2, 2020
View reviewed changes
Copy link
Member

@Trott Trott left a comment

Choose a reason for hiding this comment

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

LGTM with nit

DavenportEmma and others added 3 commits February 3, 2020 11:20
@DavenportEmma
src: change Fill() to use ParseArrayIndex()
a60a104 
Changed Fill() to use ParseArrayIndex() when getting start and end of buffers instead of Uint32Value, supporting buffers of greater than 2**32

Fixes: nodejs#31514
@DavenportEmma
test: remove buffer overflow test
52b6882 
Removed test for overflowing buffers after changes in node_buffer.cc

Refs: https://github.com/ConorDavenport/node/blob/master/src/node_buffer.cc nodejs#31514
@Trott @DavenportEmma
fixup! test: remove buffer overflow test
33a26bc
jasnell pushed a commit that referenced this pull request Feb 3, 2020
@DavenportEmma @jasnell
src: change Fill() to use ParseArrayIndex()
d4660ab 
Changed Fill() to use ParseArrayIndex() when getting start and end
of buffers instead of Uint32Value, supporting buffers of greater
than 2**32

Fixes: #31514
Co-Authored-By: Rich Trott <[email protected]>

PR-URL: #31591
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@jasnell
Copy link
Member

jasnell commented Feb 3, 2020

Landed in d4660ab

@jasnell jasnell closed this Feb 3, 2020
@DavenportEmma DavenportEmma deleted the issue31514 branch February 7, 2020 10:00
codebytere pushed a commit that referenced this pull request Feb 17, 2020
@DavenportEmma @codebytere
src: change Fill() to use ParseArrayIndex()
43e2c2e 
Changed Fill() to use ParseArrayIndex() when getting start and end
of buffers instead of Uint32Value, supporting buffers of greater
than 2**32

Fixes: #31514
Co-Authored-By: Rich Trott <[email protected]>

PR-URL: #31591
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@codebytere codebytere mentioned this pull request Feb 17, 2020
Merged
codebytere pushed a commit that referenced this pull request Mar 15, 2020
@DavenportEmma @codebytere
src: change Fill() to use ParseArrayIndex()
609a7f3 
Changed Fill() to use ParseArrayIndex() when getting start and end
of buffers instead of Uint32Value, supporting buffers of greater
than 2**32

Fixes: #31514
Co-Authored-By: Rich Trott <[email protected]>

PR-URL: #31591
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: James M Snell <[email protected]>
codebytere pushed a commit that referenced this pull request Mar 17, 2020
@DavenportEmma @codebytere
src: change Fill() to use ParseArrayIndex()
da9e71b 
Changed Fill() to use ParseArrayIndex() when getting start and end
of buffers instead of Uint32Value, supporting buffers of greater
than 2**32

Fixes: #31514
Co-Authored-By: Rich Trott <[email protected]>

PR-URL: #31591
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@codebytere codebytere mentioned this pull request Mar 17, 2020
Merged
codebytere pushed a commit that referenced this pull request Mar 30, 2020
@DavenportEmma @codebytere
src: change Fill() to use ParseArrayIndex()
7e52e39 
Changed Fill() to use ParseArrayIndex() when getting start and end
of buffers instead of Uint32Value, supporting buffers of greater
than 2**32

Fixes: #31514
Co-Authored-By: Rich Trott <[email protected]>

PR-URL: #31591
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Trott Trott Trott approved these changes

@bnoordhuis bnoordhuis bnoordhuis approved these changes

@jasnell jasnell jasnell approved these changes

@addaleax addaleax addaleax approved these changes

Assignees
No one assigned
Labels
buffer Issues and PRs related to the buffer subsystem. c++ Issues and PRs that require attention from people who are familiar with C++.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@DavenportEmma @jasnell @bnoordhuis @Trott @addaleax @nodejs-github-bot