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

streams: add null check in Readable.from #32873

Closed
wants to merge 1 commit into from
Closed

streams: add null check in Readable.from #32873

wants to merge 1 commit into from

Conversation

rexagod
Copy link
Member

@rexagod rexagod commented Apr 16, 2020 •
edited
Loading

Throws ERR_STREAM_NULL_VALUES error if a null value is passed to
Readable.from. Also added docs for the same.

Fixes: #32845

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

himself65
himself65 reviewed Apr 16, 2020
View reviewed changes
Copy link
Member

@himself65 himself65 left a comment

Choose a reason for hiding this comment

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

Test needed

himself65
himself65 previously requested changes Apr 17, 2020
View reviewed changes
test/parallel/test-stream-readable-next-no-null.js Outdated Show resolved Hide resolved
@rexagod
Copy link
Member Author

rexagod commented Apr 26, 2020

ping @addaleax @himself65

@addaleax
Copy link
Member

@rexagod This LGTM but it looks like this needs to be rebased against master to resolve merge conflicts.

ronag
ronag requested changes Apr 27, 2020
View reviewed changes
lib/internal/streams/from.js Outdated
} else {
reading = false;
const res = await value;
if (res == null) throw new ERR_STREAM_NULL_VALUES();
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure I agree with this throwing. There is no way to catch this? I think it should do readable.destroy(new ERR_STREAM_NULL_VALUES()). @lpinca Thoughts?

@ronag
Copy link
Member

ronag commented Apr 27, 2020

@nodejs/streams

@ronag ronag added the stream Issues and PRs related to the stream subsystem. label Apr 27, 2020
ronag
ronag reviewed Apr 27, 2020
View reviewed changes
lib/internal/streams/from.js Outdated Show resolved Hide resolved
@himself65 himself65 dismissed their stale review April 27, 2020 09:30

no changes request

ronag
ronag reviewed Apr 27, 2020
View reviewed changes
doc/api/stream.md Outdated Show resolved Hide resolved
ronag
ronag reviewed Apr 27, 2020
View reviewed changes
lib/internal/streams/from.js Outdated Show resolved Hide resolved
@ronag
Copy link
Member

ronag commented Apr 27, 2020 •
edited
Loading

I would like @lpinca's feedback here on whether we throw err or destroy(err).

mcollina
mcollina approved these changes Apr 27, 2020
View reviewed changes
Copy link
Member

@mcollina mcollina left a comment

Choose a reason for hiding this comment

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

lgtm

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31003/

ronag
ronag reviewed Apr 27, 2020
View reviewed changes
lib/internal/streams/from.js Outdated Show resolved Hide resolved
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31004/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31011/

@ronag ronag added the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 27, 2020
@addaleax addaleax removed the author ready PRs that have at least one approval, no pending requests for changes, and a CI started. label Apr 27, 2020
@addaleax
Copy link
Member

@rexagod Looks like a merge commit somehow got in here, can you rebase this against master?

@rexagod
streams: add null check in Readable.from
aa854d4 
Throws `ERR_STREAM_NULL_VALUES` error if a null value is passed to
`Readable.from`. Also added docs for the same.

Fixes: nodejs#32845

resolve recieved value and add test

Update test/parallel/test-stream-readable-next-no-null.js

Co-Authored-By: 扩散性百万甜面包 <[email protected]>

rebase fix

fixup

fixup: destroy -> throw
@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31050/

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/31077/

mcollina pushed a commit that referenced this pull request Apr 29, 2020
@rexagod @himself65 @mcollina
stream: add null check in Readable.from
2cd7970 
Throws `ERR_STREAM_NULL_VALUES` error if a null value is passed to
`Readable.from`. Also added docs for the same.

Co-Authored-By: 扩散性百万甜面包 <[email protected]>
Fixes: #32845
PR-URL: #32873
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Robert Nagy <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
@mcollina
Copy link
Member

Landed in 2cd7970

@mcollina mcollina closed this Apr 29, 2020
targos pushed a commit that referenced this pull request May 4, 2020
@rexagod @himself65 @targos
stream: add null check in Readable.from
bc40ed3 
Throws `ERR_STREAM_NULL_VALUES` error if a null value is passed to
`Readable.from`. Also added docs for the same.

Co-Authored-By: 扩散性百万甜面包 <[email protected]>
Fixes: #32845
PR-URL: #32873
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Robert Nagy <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
@targos targos mentioned this pull request May 4, 2020
Merged
targos pushed a commit that referenced this pull request May 7, 2020
@rexagod @himself65 @targos
stream: add null check in Readable.from
c2898f3 
Throws `ERR_STREAM_NULL_VALUES` error if a null value is passed to
`Readable.from`. Also added docs for the same.

Co-Authored-By: 扩散性百万甜面包 <[email protected]>
Fixes: #32845
PR-URL: #32873
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Robert Nagy <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
@targos targos mentioned this pull request May 7, 2020
Merged
targos pushed a commit that referenced this pull request May 13, 2020
@rexagod @himself65 @targos
stream: add null check in Readable.from
c86883e 
Throws `ERR_STREAM_NULL_VALUES` error if a null value is passed to
`Readable.from`. Also added docs for the same.

Co-Authored-By: 扩散性百万甜面包 <[email protected]>
Fixes: #32845
PR-URL: #32873
Reviewed-By: Ruben Bridgewater <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Robert Nagy <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BridgeAR BridgeAR BridgeAR approved these changes

@ronag ronag ronag approved these changes

@addaleax addaleax addaleax approved these changes

@mcollina mcollina mcollina approved these changes

@himself65 himself65 himself65 left review comments

Assignees
No one assigned
Labels
stream Issues and PRs related to the stream subsystem.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

stream: Readable.from with null
7 participants
@rexagod @addaleax @ronag @nodejs-github-bot @mcollina @BridgeAR @himself65