BackPup/node
1
0 Fork 0
mirror of https://github.com/nodejs/node.git synced 2026-11-09 15:11:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

smalloc: fix copyOnto optimization

Browse Source 
copyOnto is broken when one argument has 1 byte size and the other > 1
byte.

PR-URL: https://github.com/joyent/node/pull/8637
Reviewed-by: Trevor Norris <trev.norris@gmail.com>
This commit is contained in:
Vladimir Kurchatkin authored and Trevor Norris committed 2014-10-30 15:49:02 -07:00
1 parent c2b4f4809b
commit 849fcdeca0
2 files changed
+15 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/smalloc.cc
+1 -1
View File
@@ -207,7 +207,7 @@ void CopyOnto(const FunctionCallbackInfo<Value>& args) {
size_t dest_size = ExternalArraySize(dest_type);
// optimization for Uint8 arrays (i.e. Buffers)
if (source_size != 1 && dest_size != 1) {
if (source_size != 1 || dest_size != 1) {
if (source_size == 0)
return env->ThrowTypeError("unknown source external array type");
if (dest_size == 0)
test/simple/test-smalloc.js
+14
View File
@@ -161,6 +161,20 @@ if (os.endianness() === 'LE') {
copyOnto(c, 0, b, 0, 2);
assert.equal(b[0], 0.1);
var b = alloc(1, Types.Uint16);
var c = alloc(2, Types.Uint8);
c[0] = c[1] = 0xff;
copyOnto(c, 0, b, 0, 2);
assert.equal(b[0], 0xffff);
var b = alloc(2, Types.Uint8);
var c = alloc(1, Types.Uint16);
c[0] = 0xffff;
copyOnto(c, 0, b, 0, 1);
assert.equal(b[0], 0xff);
assert.equal(b[1], 0xff);
// verify checking external if has external memory