Browse Source

smalloc: don't allow to dispose typed arrays

PR-URL: https://github.com/joyent/node/pull/8743
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
v0.11.15-release
Vladimir Kurchatkin 10 years ago
committed by Trevor Norris
parent
commit
bf3e0f417b
  1. 2
      lib/smalloc.js
  2. 4
      src/smalloc.cc
  3. 4
      test/simple/test-smalloc.js

2
lib/smalloc.js

@ -86,6 +86,8 @@ function dispose(obj) {
throw new TypeError('obj must be an Object');
if (util.isBuffer(obj))
throw new TypeError('obj cannot be a Buffer');
if (smalloc.isTypedArray(obj))
throw new TypeError('obj cannot be a typed array');
if (!smalloc.hasExternalData(obj))
throw new Error('obj has no external array data');

4
src/smalloc.cc

@ -446,6 +446,9 @@ bool HasExternalData(Environment* env, Local<Object> obj) {
return obj->HasIndexedPropertiesInExternalArrayData();
}
void IsTypedArray(const FunctionCallbackInfo<Value>& args) {
args.GetReturnValue().Set(args[0]->IsTypedArray());
}
void AllocTruncate(const FunctionCallbackInfo<Value>& args) {
Environment* env = Environment::GetCurrent(args.GetIsolate());
@ -547,6 +550,7 @@ void Initialize(Handle<Object> exports,
NODE_SET_METHOD(exports, "truncate", AllocTruncate);
NODE_SET_METHOD(exports, "hasExternalData", HasExternalData);
NODE_SET_METHOD(exports, "isTypedArray", IsTypedArray);
exports->Set(FIXED_ONE_BYTE_STRING(env->isolate(), "kMaxLength"),
Uint32::NewFromUnsigned(env->isolate(), kMaxLength));

4
test/simple/test-smalloc.js

@ -323,6 +323,10 @@ assert.throws(function() {
smalloc.dispose(new Buffer());
});
assert.throws(function() {
smalloc.dispose(new Uint8Array(new ArrayBuffer(1)));
});
assert.throws(function() {
smalloc.dispose({});
});

Loading…
Cancel
Save