bl 4.0.0 → 4.0.4

package/.travis.yml

@@ -1,15 +1,16 @@
 sudo: false
+arch:
+ - amd64
+ - ppc64le
 language: node_js
 node_js:
   - '6'
   - '8'
   - '10'
   - '12'
+  - '14'
+  - '15'
   - lts/*
-  - current
-branches:
-  only:
-    - master
 notifications:
   email:
     - rod@vagg.org

package/BufferList.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const symbol = Symbol.for('BufferList')
 
 function BufferList (buf) {
@@ -133,12 +134,13 @@ BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) {
 
     if (bytes > l) {
       this._bufs[i].copy(dst, bufoff, start)
+      bufoff += l
     } else {
       this._bufs[i].copy(dst, bufoff, start, start + bytes)
+      bufoff += l
       break
     }
 
-    bufoff += l
     bytes -= l
 
     if (start) {
@@ -146,6 +148,9 @@ BufferList.prototype.copy = function copy (dst, dstStart, srcStart, srcEnd) {
     }
   }
 
+  // safeguard so that we don't return uninitialized memory
+  if (dst.length > bufoff) return dst.slice(0, bufoff)
+
   return dst
 }
 
@@ -187,6 +192,11 @@ BufferList.prototype.toString = function toString (encoding, start, end) {
 }
 
 BufferList.prototype.consume = function consume (bytes) {
+  // first, normalize the argument, in accordance with how Buffer does it
+  bytes = Math.trunc(bytes)
+  // do nothing if not a positive number
+  if (Number.isNaN(bytes) || bytes <= 0) return this
+
   while (this._bufs.length) {
     if (bytes >= this._bufs[0].length) {
       bytes -= this._bufs[0].length

package/README.md

@@ -1,6 +1,6 @@
 # bl *(BufferList)*
 
-[![Build Status](https://travis-ci.org/rvagg/bl.svg?branch=master)](https://travis-ci.org/rvagg/bl)
+[![Build Status](https://api.travis-ci.com/rvagg/bl.svg?branch=master)](https://travis-ci.com/rvagg/bl/)
 
 **A Node.js Buffer list collector, reader and streamer thingy.**
 
@@ -72,10 +72,10 @@ hyperquest(url).pipe(BufferListStream((err, data) => {
 Or, use it as a readable stream to recompose a list of Buffers to an output source:
 
 ```js
-const { BufferList } = require('bl')
+const { BufferListStream } = require('bl')
 const fs = require('fs')
 
-var bl = new BufferList()
+var bl = new BufferListStream()
 bl.append(Buffer.from('abcd'))
 bl.append(Buffer.from('efg'))
 bl.append(Buffer.from('hi'))
@@ -171,7 +171,7 @@ No copies will be performed. All buffers in the result share memory with the ori
 `duplicate()` performs a **shallow-copy** of the list. The internal Buffers remains the same, so if you change the underlying Buffers, the change will be reflected in both the original and the duplicate. This method is needed if you want to call `consume()` or `pipe()` and still keep the original list.Example:
 
 ```js
-var bl = new BufferList()
+var bl = new BufferListStream()
 
 bl.append('hello')
 bl.append(' world')

package/bl.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const DuplexStream = require('readable-stream').Duplex
-const util = require('util')
+const inherits = require('inherits')
 const BufferList = require('./BufferList')
 
 function BufferListStream (callback) {
@@ -33,7 +33,7 @@ function BufferListStream (callback) {
   DuplexStream.call(this)
 }
 
-util.inherits(BufferListStream, DuplexStream)
+inherits(BufferListStream, DuplexStream)
 Object.assign(BufferListStream.prototype, BufferList.prototype)
 
 BufferListStream.prototype._new = function _new (callback) {

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "bl",
-  "version": "4.0.0",
+  "version": "4.0.4",
   "description": "Buffer List: collect buffers and access with a standard readable Buffer interface, streamable too!",
+  "license": "MIT",
   "main": "bl.js",
   "scripts": {
     "lint": "standard *.js test/*.js",
@@ -23,8 +24,9 @@
     "stream",
     "awesomesauce"
   ],
-  "license": "MIT",
   "dependencies": {
+    "buffer": "^5.5.0",
+    "inherits": "^2.0.4",
     "readable-stream": "^3.4.0"
   },
   "devDependencies": {

package/test/convert.js

@@ -2,7 +2,7 @@
 
 const tape = require('tape')
 const { BufferList, BufferListStream } = require('../')
-const { Buffer } = require('safe-buffer')
+const { Buffer } = require('buffer')
 
 tape('convert from BufferList to BufferListStream', (t) => {
   const data = Buffer.from(`TEST-${Date.now()}`)

package/test/indexOf.js

@@ -2,7 +2,7 @@
 
 const tape = require('tape')
 const BufferList = require('../')
-const Buffer = require('safe-buffer').Buffer
+const { Buffer } = require('buffer')
 
 tape('indexOf single byte needle', (t) => {
   const bl = new BufferList(['abcdefg', 'abcdefg', '12345'])
@@ -345,9 +345,9 @@ tape('indexOf the entire nodejs10 buffer test suite', (t) => {
 
   // Search for a non-ASCII string in a pure ASCII string.
   const asciiString = Buffer.from(
-    'arglebargleglopglyfarglebargleglopglyfarglebargleglopglyf')
+    'somethingnotatallsinisterwhichalsoworks')
   t.equal(-1, asciiString.indexOf('\x2061'))
-  t.equal(3, asciiString.indexOf('leb', 0))
+  t.equal(3, asciiString.indexOf('eth', 0))
 
   // Search in string containing many non-ASCII chars.
   const allCodePoints = []

package/test/isBufferList.js

@@ -2,7 +2,7 @@
 
 const tape = require('tape')
 const { BufferList, BufferListStream } = require('../')
-const { Buffer } = require('safe-buffer')
+const { Buffer } = require('buffer')
 
 tape('isBufferList positives', (t) => {
   t.ok(BufferList.isBufferList(new BufferList()))

package/test/test.js

@@ -5,7 +5,7 @@ const crypto = require('crypto')
 const fs = require('fs')
 const path = require('path')
 const BufferList = require('../')
-const Buffer = require('safe-buffer').Buffer
+const { Buffer } = require('buffer')
 
 const encodings =
       ('hex utf8 utf-8 ascii binary base64' +
@@ -463,6 +463,22 @@ tape('test toString encoding', function (t) {
   t.end()
 })
 
+tape('uninitialized memory', function (t) {
+  const secret = crypto.randomBytes(256)
+  for (let i = 0; i < 1e6; i++) {
+    const clone = Buffer.from(secret)
+    const bl = new BufferList()
+    bl.append(Buffer.from('a'))
+    bl.consume(-1024)
+    const buf = bl.slice(1)
+    if (buf.indexOf(clone) !== -1) {
+      t.fail(`Match (at ${i})`)
+      break
+    }
+  }
+  t.end()
+})
+
 !process.browser && tape('test stream', function (t) {
   const random = crypto.randomBytes(65534)