diff --git a/lib/buffer.js b/lib/buffer.js index 60876b4d421c..114ea66a3a5e 100644 --- a/lib/buffer.js +++ b/lib/buffer.js @@ -1203,7 +1203,7 @@ Buffer.prototype.fill = function fill(value, offset, end, encoding) { function _fill(buf, value, offset, end, encoding) { if (typeof value === 'string') { - if (offset === undefined || typeof offset === 'string') { + if (typeof offset === 'string') { encoding = offset; offset = 0; end = buf.length; @@ -1240,19 +1240,17 @@ function _fill(buf, value, offset, end, encoding) { if (offset === undefined) { offset = 0; - end = buf.length; } else { validateOffset(offset, 'offset'); - // Invalid ranges are not set to a default, so can range check early. - if (end === undefined) { - end = buf.length; - } else { - validateOffset(end, 'end', 0, buf.length); - } - if (offset >= end) - return buf; } - + if (end === undefined) { + end = buf.length; + } else { + validateOffset(end, 'end', 0, buf.length); + } + if (offset >= end) { + return buf; + } if (typeof value === 'number') { // OOB check diff --git a/test/parallel/test-buffer-fill.js b/test/parallel/test-buffer-fill.js index c3476461fdaf..e3111e60caa6 100644 --- a/test/parallel/test-buffer-fill.js +++ b/test/parallel/test-buffer-fill.js @@ -180,9 +180,17 @@ deepStrictEqualValues(genBuffer(4, [hexBufFill, 1]), [0, 1, 2, 1]); deepStrictEqualValues(genBuffer(4, [hexBufFill, 1, 3]), [0, 1, 2, 0]); deepStrictEqualValues(genBuffer(4, [hexBufFill, 1, 1]), [0, 0, 0, 0]); +// An undefined offset defaults to zero without discarding an explicit end. +deepStrictEqualValues(genBuffer(4, [1, undefined, 2]), [1, 1, 0, 0]); +deepStrictEqualValues(genBuffer(4, ['a', undefined, 2]), [97, 97, 0, 0]); +deepStrictEqualValues(genBuffer(4, [hexBufFill, undefined, 2]), [1, 2, 0, 0]); +deepStrictEqualValues(genBuffer(4, ['6162', undefined, 2, 'hex']), [97, 98, 0, 0]); +deepStrictEqualValues(genBuffer(4, [1, undefined, 0]), [0, 0, 0, 0]); + // Check exceptions [ [0, -1], + [0, undefined, buf1.length + 1], [0, 0, buf1.length + 1], ['', -1], ['', 0, buf1.length + 1],