Use safe-buffer

Use the new Buffer APIs from Node v6 for added security. For example,
Buffer.from() will throw if passed a number, unlike Buffer() which
allocated UNINITIALIZED memory.

Use the safe-buffer package for compatibility with previous versions of
Node.js, including v4.x, v0.12, and v0.10.

https://github.com/feross/safe-buffer

8 files changed, 21 insertions, 13 deletions

diff --git a/test/browser/basic.js b/test/browser/basic.js
index 395fe8e..7bc488e 100644
--- a/test/browser/basic.js
+++ b/test/browser/basic.js
@@ -1,7 +1,8 @@
+var Buffer = require('safe-buffer').Buffer
 var test = require('tape')
 var WebTorrent = require('../../')
 
-var img = new Buffer('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7', 'base64')
+var img = Buffer.from('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7', 'base64')
 img.name = 'img.png'
 
 function verifyImage (t, err, elem) {
diff --git a/test/client-add.js b/test/client-add.js
index d30fea0..a3a18cd 100644
--- a/test/client-add.js
+++ b/test/client-add.js
@@ -1,3 +1,4 @@
+var Buffer = require('safe-buffer').Buffer
 var extend = require('xtend')
 var fixtures = require('webtorrent-fixtures')
 var test = require('tape')
@@ -84,7 +85,7 @@ test('client.add: info hash, buffer', function (t) {
     t.equal(torrent.infoHash, fixtures.leaves.parsedTorrent.infoHash)
     t.ok(torrent.magnetURI.indexOf('magnet:?xt=urn:btih:' + fixtures.leaves.parsedTorrent.infoHash) === 0)
 
-    client.remove(new Buffer(fixtures.leaves.parsedTorrent.infoHash, 'hex'), function (err) { t.error(err, 'torrent destroyed') })
+    client.remove(Buffer.from(fixtures.leaves.parsedTorrent.infoHash, 'hex'), function (err) { t.error(err, 'torrent destroyed') })
     t.equal(client.torrents.length, 0)
 
     client.destroy(function (err) { t.error(err, 'client destroyed') })
@@ -204,5 +205,5 @@ test('client.add: invalid torrent id: short buffer', function (t) {
   })
   client.on('warning', function (err) { t.fail(err) })
 
-  client.add(new Buffer('abc'))
+  client.add(Buffer.from('abc'))
 })
diff --git a/test/client-destroy.js b/test/client-destroy.js
index deda9f3..956c966 100644
--- a/test/client-destroy.js
+++ b/test/client-destroy.js
@@ -1,3 +1,4 @@
+var Buffer = require('safe-buffer').Buffer
 var fixtures = require('webtorrent-fixtures')
 var test = require('tape')
 var WebTorrent = require('../')
@@ -16,7 +17,7 @@ test('after client.destroy(), throw on client.add() or client.seed()', function
     client.add('magnet:?xt=urn:btih:' + fixtures.leaves.parsedTorrent.infoHash)
   })
   t.throws(function () {
-    client.seed(new Buffer('sup'))
+    client.seed(Buffer.from('sup'))
   })
 })
 
diff --git a/test/client-seed.js b/test/client-seed.js
index 1f50d9b..eede4a3 100644
--- a/test/client-seed.js
+++ b/test/client-seed.js
@@ -1,5 +1,6 @@
 /* global Blob */
 
+var Buffer = require('safe-buffer').Buffer
 var fixtures = require('webtorrent-fixtures')
 var test = require('tape')
 var WebTorrent = require('../')
@@ -34,7 +35,7 @@ test('client.seed: torrent file (Buffer), set name on buffer', function (t) {
   client.on('error', function (err) { t.fail(err) })
   client.on('warning', function (err) { t.fail(err) })
 
-  var buf = new Buffer(fixtures.leaves.content)
+  var buf = Buffer.from(fixtures.leaves.content)
   buf.name = 'Leaves of Grass by Walt Whitman.epub'
 
   client.seed(buf, function (torrent) {
diff --git a/test/node/swarm-basic.js b/test/node/swarm-basic.js
index f81c3a4..cdc54ef 100644
--- a/test/node/swarm-basic.js
+++ b/test/node/swarm-basic.js
@@ -1,11 +1,12 @@
+// var Buffer = require('safe-buffer').Buffer
 // var hat = require('hat')
 // var Swarm = require('../../lib/swarm')
 // var test = require('tape')
 
 // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36'
 // var infoHash2 = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa37'
-// var peerId = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
-// var peerId2 = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
 
 // test('two swarms listen on same port', function (t) {
 //   t.plan(2)
diff --git a/test/node/swarm-reconnect.js b/test/node/swarm-reconnect.js
index abf3cc2..1eaec47 100644
--- a/test/node/swarm-reconnect.js
+++ b/test/node/swarm-reconnect.js
@@ -1,10 +1,11 @@
+// var Buffer = require('safe-buffer').Buffer
 // var hat = require('hat')
 // var Swarm = require('../../lib/swarm')
 // var test = require('tape')
 
 // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36'
-// var peerId1 = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
-// var peerId2 = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId1 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
 
 // test('reconnect when peer disconnects', function (t) {
 //   t.plan(10)
diff --git a/test/node/swarm-timeout.js b/test/node/swarm-timeout.js
index 50c9822..97fcdf2 100644
--- a/test/node/swarm-timeout.js
+++ b/test/node/swarm-timeout.js
@@ -1,10 +1,11 @@
+// var Buffer = require('safe-buffer').Buffer
 // var hat = require('hat')
 // var Swarm = require('../../lib/swarm')
 // var test = require('tape')
 
 // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36'
-// var peerId1 = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
-// var peerId2 = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId1 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
 
 // test('timeout if no handshake in 25 seconds', function (t) {
 //   t.plan(4)
diff --git a/test/swarm.js b/test/swarm.js
index 023455b..6b57951 100644
--- a/test/swarm.js
+++ b/test/swarm.js
@@ -1,11 +1,12 @@
+// var Buffer = require('safe-buffer').Buffer
 // var hat = require('hat')
 // var Swarm = require('../lib/swarm')
 // var test = require('tape')
 
 // var infoHash = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa36'
 // var infoHash2 = 'd2474e86c95b19b8bcfdb92bc12c9d44667cfa37'
-// var peerId = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
-// var peerId2 = new Buffer('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
+// var peerId2 = Buffer.from('-WW0001-' + hat(48), 'utf8').toString('hex')
 
 // test('create swarm, check invariants', function (t) {
 //   var swarm = new Swarm(infoHash, peerId)