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: detect nul bytes in InternalModuleReadFile() #14854

Closed
wants to merge 1 commit into from
Closed

src: detect nul bytes in InternalModuleReadFile() #14854

wants to merge 1 commit into from

Conversation

bnoordhuis
Copy link
Member

@bnoordhuis bnoordhuis commented Aug 16, 2017 •
edited by TimothyGu
Loading

Throw an exception when the path contains nul bytes, don't abort.

Fixes: #13787
CI: https://ci.nodejs.org/job/node-test-pull-request/9683/

@bnoordhuis
src: detect nul bytes in InternalModuleReadFile()
6067ee7 
Throw an exception when the path contains nul bytes, don't abort.

Fixes: nodejs#13787
@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. fs Issues and PRs related to the fs subsystem / file system. labels Aug 16, 2017
@bnoordhuis
Copy link
Member Author

I didn't add a check to InternalModuleStat() because:

  1. Performance. It's called much more often.
  2. It seems unnecessary. Worst case you stat the wrong file but InternalModuleReadFile() will still catch it.

@cjihrig cjihrig mentioned this pull request Aug 17, 2017
Closed
@addaleax
Copy link
Member

Landed in ffed7b6

@addaleax addaleax closed this Aug 21, 2017
addaleax pushed a commit that referenced this pull request Aug 21, 2017
@bnoordhuis @addaleax
src: detect nul bytes in InternalModuleReadFile()
ffed7b6 
Throw an exception when the path contains nul bytes, don't abort.

Fixes: #13787
PR-URL: #14854
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@cjihrig cjihrig mentioned this pull request Aug 25, 2017
Closed
MylesBorins pushed a commit that referenced this pull request Sep 10, 2017
@bnoordhuis @MylesBorins
src: detect nul bytes in InternalModuleReadFile()
787d563 
Throw an exception when the path contains nul bytes, don't abort.

Fixes: #13787
PR-URL: #14854
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@MylesBorins MylesBorins mentioned this pull request Sep 10, 2017
Merged
MylesBorins pushed a commit that referenced this pull request Sep 12, 2017
@bnoordhuis @MylesBorins
src: detect nul bytes in InternalModuleReadFile()
992d1dd 
Throw an exception when the path contains nul bytes, don't abort.

Fixes: #13787
PR-URL: #14854
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@MylesBorins
Copy link
Contributor

I've backported this to v6.x. please let me know if it should be backed out

MylesBorins pushed a commit that referenced this pull request Sep 20, 2017
@bnoordhuis @MylesBorins
src: detect nul bytes in InternalModuleReadFile()
b2112f8 
Throw an exception when the path contains nul bytes, don't abort.

Fixes: #13787
PR-URL: #14854
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Timothy Gu <timothygu99@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
@MylesBorins MylesBorins mentioned this pull request Sep 20, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tniessen tniessen tniessen approved these changes

@cjihrig cjihrig cjihrig approved these changes

@TimothyGu TimothyGu TimothyGu approved these changes

@addaleax addaleax addaleax approved these changes

@jasnell jasnell jasnell approved these changes

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

Successfully merging this pull request may close these issues.
8 participants
@bnoordhuis @addaleax @MylesBorins @jasnell @TimothyGu @cjihrig @tniessen @nodejs-github-bot