Skip to content

Commit 4a34c69

Browse files
trevnorristrevnorris
committed
buffer: return offset for end of last write
1 parent 2bedf6e commit 4a34c69

3 files changed

Lines changed: 32 additions & 8 deletions

File tree

‎lib/buffer.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -574,6 +574,7 @@ Buffer.prototype.writeUInt8 = function(value, offset, noAssert) {
574574
if (!noAssert)
575575
checkInt(this, value, offset, 1, 0xff, 0);
576576
this[offset] = value;
577+
return offset + 1;
577578
};
578579

579580

@@ -594,6 +595,7 @@ Buffer.prototype.writeUInt16LE = function(value, offset, noAssert) {
594595
if (!noAssert)
595596
checkInt(this, value, offset, 2, 0xffff, 0);
596597
writeUInt16(this, value, offset, false);
598+
return offset + 2;
597599
};
598600

599601

@@ -603,6 +605,7 @@ Buffer.prototype.writeUInt16BE = function(value, offset, noAssert) {
603605
if (!noAssert)
604606
checkInt(this, value, offset, 2, 0xffff, 0);
605607
writeUInt16(this, value, offset, true);
608+
return offset + 2;
606609
};
607610

608611

@@ -627,6 +630,7 @@ Buffer.prototype.writeUInt32LE = function(value, offset, noAssert) {
627630
if (!noAssert)
628631
checkInt(this, value, offset, 4, 0xffffffff, 0);
629632
writeUInt32(this, value, offset, false);
633+
return offset + 4;
630634
};
631635

632636

@@ -636,6 +640,7 @@ Buffer.prototype.writeUInt32BE = function(value, offset, noAssert) {
636640
if (!noAssert)
637641
checkInt(this, value, offset, 4, 0xffffffff, 0);
638642
writeUInt32(this, value, offset, true);
643+
return offset + 4;
639644
};
640645

641646

@@ -683,6 +688,7 @@ Buffer.prototype.writeInt8 = function(value, offset, noAssert) {
683688
checkInt(this, value, offset, 1, 0x7f, -0x80);
684689
if (value < 0) value = 0xff + value + 1;
685690
this[offset] = value;
691+
return offset + 1;
686692
};
687693

688694

@@ -693,6 +699,7 @@ Buffer.prototype.writeInt16LE = function(value, offset, noAssert) {
693699
checkInt(this, value, offset, 2, 0x7fff, -0x8000);
694700
if (value < 0) value = 0xffff + value + 1;
695701
writeUInt16(this, value, offset, false);
702+
return offset + 2;
696703
};
697704

698705

@@ -703,6 +710,7 @@ Buffer.prototype.writeInt16BE = function(value, offset, noAssert) {
703710
checkInt(this, value, offset, 2, 0x7fff, -0x8000);
704711
if (value < 0) value = 0xffff + value + 1;
705712
writeUInt16(this, value, offset, true);
713+
return offset + 2;
706714
};
707715

708716

@@ -713,6 +721,7 @@ Buffer.prototype.writeInt32LE = function(value, offset, noAssert) {
713721
checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000);
714722
if (value < 0) value = 0xffffffff + value + 1;
715723
writeUInt32(this, value, offset, false);
724+
return offset + 4;
716725
};
717726

718727

@@ -723,4 +732,5 @@ Buffer.prototype.writeInt32BE = function(value, offset, noAssert) {
723732
checkInt(this, value, offset, 4, 0x7fffffff, -0x80000000);
724733
if (value < 0) value = 0xffffffff + value + 1;
725734
writeUInt32(this, value, offset, true);
735+
return offset + 4;
726736
};

‎src/node_buffer.cc‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -485,18 +485,23 @@ void ReadDoubleBE(const FunctionCallbackInfo<Value>& args) {
485485

486486

487487
template <typename T, enum Endianness endianness>
488-
void WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
488+
uint32_t WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
489489
bool doAssert = !args[2]->BooleanValue();
490490

491491
T val = static_cast<T>(args[0]->NumberValue());
492492
size_t offset;
493493

494-
CHECK_NOT_OOB(ParseArrayIndex(args[1], 0, &offset));
494+
if (!ParseArrayIndex(args[1], 0, &offset)) {
495+
ThrowRangeError("out of range index");
496+
return 0;
497+
}
495498

496499
if (doAssert) {
497500
size_t len = Length(args.This());
498-
if (offset + sizeof(T) > len || offset + sizeof(T) < offset)
499-
return ThrowRangeError("Trying to write beyond buffer length");
501+
if (offset + sizeof(T) > len || offset + sizeof(T) < offset) {
502+
ThrowRangeError("Trying to write beyond buffer length");
503+
return 0;
504+
}
500505
}
501506

502507
union NoAlias {
@@ -509,26 +514,27 @@ void WriteFloatGeneric(const FunctionCallbackInfo<Value>& args) {
509514
char* ptr = static_cast<char*>(data) + offset;
510515
if (endianness != GetEndianness()) Swizzle(na.bytes, sizeof(na.bytes));
511516
memcpy(ptr, na.bytes, sizeof(na.bytes));
517+
return offset + sizeof(na.bytes);
512518
}
513519

514520

515521
void WriteFloatLE(const FunctionCallbackInfo<Value>& args) {
516-
WriteFloatGeneric<float, kLittleEndian>(args);
522+
args.GetReturnValue().Set(WriteFloatGeneric<float, kLittleEndian>(args));
517523
}
518524

519525

520526
void WriteFloatBE(const FunctionCallbackInfo<Value>& args) {
521-
WriteFloatGeneric<float, kBigEndian>(args);
527+
args.GetReturnValue().Set(WriteFloatGeneric<float, kBigEndian>(args));
522528
}
523529

524530

525531
void WriteDoubleLE(const FunctionCallbackInfo<Value>& args) {
526-
WriteFloatGeneric<double, kLittleEndian>(args);
532+
args.GetReturnValue().Set(WriteFloatGeneric<double, kLittleEndian>(args));
527533
}
528534

529535

530536
void WriteDoubleBE(const FunctionCallbackInfo<Value>& args) {
531-
WriteFloatGeneric<double, kBigEndian>(args);
537+
args.GetReturnValue().Set(WriteFloatGeneric<double, kBigEndian>(args));
532538
}
533539

534540

‎test/simple/test-buffer.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -778,6 +778,14 @@ assert.equal(buf[3], 0xFF);
778778
assert.equal(buf[3], 0xFF);
779779
});
780780

781+
// test offset returns are correct
782+
var b = new Buffer(16);
783+
assert.equal(4, b.writeUInt32LE(0, 0));
784+
assert.equal(6, b.writeUInt16LE(0, 4));
785+
assert.equal(7, b.writeUInt8(0, 6));
786+
assert.equal(8, b.writeInt8(0, 7));
787+
assert.equal(16, b.writeDoubleLE(0, 8));
788+
781789
// test for buffer overrun
782790
buf = new Buffer([0, 0, 0, 0, 0]); // length: 5
783791
var sub = buf.slice(0, 4); // length: 4

0 commit comments

Comments
 (0)