src: fix vector subscript out of range #18460
Conversation
apapirovski
added
c++
nodejs-github-bot
added
the
c++
There was a problem hiding this comment.
Tests pass: https://ci.nodejs.org/job/node-test-commit-light/196/
This seems to solve the problem. Thanks for the quick fix @apapirovski!
|
It would be great if someone else from @nodejs/platform-windows could confirm that this indeed fixes the issue before fast-tracking this. |
| @@ -1002,7 +1002,9 @@ MaybeLocal<Value> InternalMakeCallback(Environment* env, | |||
| } else { | |||
| std::vector<Local<Value>> args(1 + argc); | |||
| args[0] = callback; | |||
| std::copy(&argv[0], &argv[argc], &args[1]); | |||
There was a problem hiding this comment.
You could replace &args[1] with &args.data()[1] to get rid of the conditional.
(It's legal to create a pointer that points one element beyond the array as long as you don't dereference it - which won't happen if argc == 0 because there won't be elements to copy.)
There was a problem hiding this comment.
Even better: replace it with args.begin() + 1, since std::copy works with iterators.
There was a problem hiding this comment.
Ok, updated now. Thanks for the feedback.
There was a problem hiding this comment.
Please use either mine or @bnoordhuis's suggestion to avoid the conditional.
apapirovski
force-pushed
the
fix-18459
branch
from
e2d9232 to
a9b76c7
Compare
|
Landed in 332b56c |
PR-URL: #18460 Fixes: #18459 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Nikolai Vavilov <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>
PR-URL: #18460 Fixes: #18459 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Nikolai Vavilov <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>
PR-URL: #18460 Fixes: #18459 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Nikolai Vavilov <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>
PR-URL: #18460 Fixes: #18459 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Nikolai Vavilov <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>
|
Needs to land if we backport #18291 |
PR-URL: nodejs#18460 Fixes: nodejs#18459 Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Nikolai Vavilov <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Khaidi Chu <[email protected]>
It appears that #18291 broke debug builds on Windows. This should resolve the issue.
@tniessen is currently running a test. If anyone else can try a Windows debug build with this patch applied, that would be appreciated.
Fixes: #18459
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passesAffected core subsystem(s)
src