buffer: make buflen in integer range
#51821
Closed
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
nodejs-github-bot
added
buffer
joyeecheung
reviewed
Feb 21, 2024
joyeecheung
reviewed
Feb 21, 2024
kylo5aby
force-pushed
the
buffer-utf8value
branch
3 times, most recently
from
3833a0f to
d51e680
Compare
kvakil
reviewed
Feb 22, 2024
src/node_buffer.cc
Outdated
Comment on lines
727
to
728
| if (max_length > static_cast<size_t>(v8::String::kMaxLength)) | ||
| ThrowErrStringTooLong(env->isolate()); |
Contributor
There was a problem hiding this comment.
Suggested change
| if (max_length > static_cast<size_t>(v8::String::kMaxLength)) | |
| ThrowErrStringTooLong(env->isolate()); | |
| if (max_length > static_cast<size_t>(v8::String::kMaxLength)) { | |
| ThrowErrStringTooLong(env->isolate()); | |
| return; | |
| } |
You're missing a return here; the Throw* functions don't actually return, you have to do it manually.
test/parallel/test-buffer-alloc.js
Outdated
Comment on lines
1158
to
1173
| // Invalid length of Buffer.utf8Write | ||
| { | ||
| const ubuf = Buffer.allocUnsafeSlow(2 ** 32); | ||
| assert.throws(() => { | ||
| ubuf.utf8Write('a', 2, kStringMaxLength + 2); | ||
| }, stringTooLongError); | ||
| } | ||
|
|
||
| // Invalid length of Buffer.write | ||
| { | ||
| const ubuf = Buffer.allocUnsafeSlow(2 ** 32); | ||
| assert.throws(() => { | ||
| ubuf.write('a', 2, kStringMaxLength + 2); | ||
| }, stringTooLongError); | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
This test probably won't work in test/parallel, since 2 GiB is a lot to allocate (maybe it'll work on Linux)? It might work to put it in test/sequential instead.
Member
There was a problem hiding this comment.
For tests that require a lot of resource, we typically use test/pummel. You could also catch ERR_MEMORY_ALLOCATION_FAILED in the buffer creation and common.skip() in the test if the memory could not be allocated.
Contributor
Author
There was a problem hiding this comment.
thanks your suggestion @joyeecheung , I have update it, add a method in StringBytes to ensure that the capacity of buffer remains within the integer range when operating with string
kvakil
added
semver-major
github-actions
bot
removed
the
request-ci
This comment was marked as outdated.
This comment was marked as outdated.
kylo5aby
force-pushed
the
buffer-utf8value
branch
from
d51e680 to
f2c4e6f
Compare
kylo5aby
changed the title
kylo5aby
changed the title
buflen in integer range
kylo5aby
force-pushed
the
buffer-utf8value
branch
3 times, most recently
from
250acee to
2e93994
Compare
joyeecheung
reviewed
Feb 23, 2024
kylo5aby
force-pushed
the
buffer-utf8value
branch
from
2e93994 to
a21b523
Compare
joyeecheung
approved these changes
Mar 1, 2024
github-actions
bot
removed
the
request-ci
This comment was marked as outdated.
This comment was marked as outdated.
Contributor
Author
|
this PR has been approved but hasn't been landed for a long time, could you please take a look? @legendecas |
kylo5aby
force-pushed
the
buffer-utf8value
branch
2 times, most recently
from
5b60d83 to
69cee50
Compare
github-actions
bot
removed
the
request-ci
This comment was marked as outdated.
This comment was marked as outdated.
Collaborator
aduh95
added
the
commit-queue
nodejs-github-bot
added
commit-queue-failed
Collaborator
Commit Queue failed- Loading data for nodejs/node/pull/51821 ✔ Done loading data for nodejs/node/pull/51821 ----------------------------------- PR info ------------------------------------ Title buffer: make `buflen` in integer range (#51821) ⚠ Could not retrieve the email or name of the PR author's from user's GitHub profile! Branch kylo5aby:buffer-utf8value -> nodejs:main Labels buffer, c++, semver-major, author ready, needs-ci Commits 1 - buffer: make `buflen` in integer range Committers 1 - Antoine du Hamel <[email protected]> PR-URL: https://github.com/nodejs/node/pull/51821 Fixes: https://github.com/nodejs/node/issues/51817 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> ------------------------------ Generated metadata ------------------------------ PR-URL: https://github.com/nodejs/node/pull/51821 Fixes: https://github.com/nodejs/node/issues/51817 Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: James M Snell <[email protected]> -------------------------------------------------------------------------------- ⚠ Commits were pushed since the last approving review: ⚠ - buffer: make `buflen` in integer range ℹ This PR was created on Wed, 21 Feb 2024 09:45:39 GMT ✔ Approvals: 2 ✔ - Joyee Cheung (@joyeecheung) (TSC): https://github.com/nodejs/node/pull/51821#pullrequestreview-2080749937 ✔ - James M Snell (@jasnell) (TSC): https://github.com/nodejs/node/pull/51821#pullrequestreview-2281595354 ✔ Last GitHub CI successful ℹ Last Full PR CI on 2025-02-23T16:54:25Z: https://ci.nodejs.org/job/node-test-pull-request/65394/ - Querying data for job/node-test-pull-request/65394/ ✔ Last Jenkins CI successful -------------------------------------------------------------------------------- ✔ Aborted `git node land` session in /home/runner/work/node/node/.ncuhttps://github.com/nodejs/node/actions/runs/13856744953 |
Member
|
Landed in 1ba4732 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 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.
make
buflenwithin the integer range whenbuffer.toString()and writing a string to buffer(for examplebuffer.write(str))Fixes: #51817