1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crypto: remove kMaxLength on randomBytes()

Browse Source 
New Buffer implementation allows greater than kMaxLength to be created.
So instead check if the passed value is a valid Smi.

PR-URL: https://github.com/nodejs/io.js/pull/1825
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
This commit is contained in:
Trevor Norris 2015-06-02 13:10:47 -06:00 committed by Rod Vagg
parent 8664084166
commit 944f68046c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/node_crypto.cc
View File

@ -4869,9 +4869,13 @@ void RandomBytes(const FunctionCallbackInfo<Value>& args) {
return env->ThrowTypeError("size must be a number >= 0"); return env->ThrowTypeError("size must be a number >= 0");
} }
const uint32_t size = args[0]->Uint32Value(); const int64_t size = args[0]->IntegerValue();
if (size > Buffer::kMaxLength) { if (using_old_buffer) {
return env->ThrowTypeError("size > Buffer::kMaxLength"); if (size > Buffer::kMaxLength)
return env->ThrowTypeError("size > Buffer::kMaxLength");
} else {
if (!IsValidSmi(size))
return env->ThrowRangeError("size is not a valid Smi");
} }
Local<Object> obj = Object::New(env->isolate()); Local<Object> obj = Object::New(env->isolate());

2
test/parallel/test-crypto-random.js
View File

@ -53,5 +53,5 @@ function checkCall(cb, desc) {
// #5126, "FATAL ERROR: v8::Object::SetIndexedPropertiesToExternalArrayData() // #5126, "FATAL ERROR: v8::Object::SetIndexedPropertiesToExternalArrayData()
// length exceeds max acceptable value" // length exceeds max acceptable value"
assert.throws(function() { assert.throws(function() {
crypto.randomBytes(0x3fffffff + 1); crypto.randomBytes((-1 >>> 0) + 1);
}, TypeError); }, TypeError);