summaryrefslogtreecommitdiff
path: root/src/node_buffer.cc
diff options
context:
space:
mode:
authorTrevor Norris <trev.norris@gmail.com>2016-10-18 16:42:17 -0600
committerTrevor Norris <trev.norris@gmail.com>2016-10-20 13:40:47 -0600
commit7bffe23da01457410a11ae40ee3a9d3be97e6c7b (patch)
tree380cf05edd7bf5e6f90dcb3e6acb58e739841460 /src/node_buffer.cc
parent6845d6e3189cb6f7d2c847ab34a4f5b2eaf7a77f (diff)
downloadandroid-node-v8-7bffe23da01457410a11ae40ee3a9d3be97e6c7b.tar.gz
android-node-v8-7bffe23da01457410a11ae40ee3a9d3be97e6c7b.tar.bz2
android-node-v8-7bffe23da01457410a11ae40ee3a9d3be97e6c7b.zip
buffer: fix range checks for slice()
Using the black magic of Symbol.toPrimitive the numeric value of start/end can be changed when Uint32Value() is called once Buffer::Fill() is entered. Allowing the CHECK() to be bypassed. The bug report was only for "start", but the same can be done with "end". Perform checks for both in node::Buffer::Fill() to make sure the issue can't be triggered, even if process.binding is used directly. Include tests for each case. Along with a check to make sure the last time the value is accessed returns -1. This should be enough to make sure Buffer::Fill() is receiving the correct value. Along with two tests against process.binding directly. Fixes: https://github.com/nodejs/node/issues/9149 PR-URL: https://github.com/nodejs/node/pull/9174 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Franziska Hinkelmann <ranziska.hinkelmann@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'src/node_buffer.cc')
-rw-r--r--src/node_buffer.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
index d7c27295e9..07a4106642 100644
--- a/src/node_buffer.cc
+++ b/src/node_buffer.cc
@@ -585,7 +585,8 @@ void Fill(const FunctionCallbackInfo<Value>& args) {
Local<String> str_obj;
size_t str_length;
enum encoding enc;
- CHECK(fill_length + start <= ts_obj_length);
+ THROW_AND_RETURN_IF_OOB(start <= end);
+ THROW_AND_RETURN_IF_OOB(fill_length + start <= ts_obj_length);
// First check if Buffer has been passed.
if (Buffer::HasInstance(args[1])) {