Skip to content

Commit

Permalink
Use safe-buffer for node 4 <4.5.0
Browse files Browse the repository at this point in the history
Re #175
  • Loading branch information
isaacs committed Mar 20, 2018
1 parent a561d63 commit c8152e8
Show file tree
Hide file tree
Showing 16 changed files with 28 additions and 2 deletions.
11 changes: 11 additions & 0 deletions lib/buffer.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict'

// Buffer in node 4.x < 4.5.0 doesn't have working Buffer.from
// or Buffer.alloc, and Buffer in node 10 deprecated the ctor.
// .M, this is fine .\^/M..
let B = Buffer
/* istanbul ignore next */
if (!B.alloc) {
B = require('safe-buffer').Buffer
}
module.exports = B
1 change: 1 addition & 0 deletions lib/header.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
// the data could not be faithfully encoded in a simple header.
// (Also, check header.needPax to see if it needs a pax header.)

const Buffer = require('./buffer.js')
const types = require('./types.js')
const pathModule = require('path')
const large = require('./large-numbers.js')
Expand Down
2 changes: 2 additions & 0 deletions lib/list.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict'

const Buffer = require('./buffer.js')

// XXX: This shares a lot in common with extract.js
// maybe some DRY opportunity here?

Expand Down
2 changes: 2 additions & 0 deletions lib/pack.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
'use strict'

const Buffer = require('./buffer.js')

// A readable tar stream creator
// Technically, this is a transform stream that you write paths into,
// and tar format comes out of.
Expand Down
1 change: 1 addition & 0 deletions lib/pax.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('./buffer.js')
const Header = require('./header.js')
const path = require('path')

Expand Down
1 change: 1 addition & 0 deletions lib/replace.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('./buffer.js')

// tar -r
const hlo = require('./high-level-opt.js')
Expand Down
1 change: 1 addition & 0 deletions lib/write-entry.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('./buffer.js')
const MiniPass = require('minipass')
const Pax = require('./pax.js')
const Header = require('./header.js')
Expand Down
3 changes: 1 addition & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
"minipass": "^2.2.1",
"minizlib": "^1.1.0",
"mkdirp": "^0.5.0",
"safe-buffer": "^5.1.1",
"yallist": "^3.0.2"
},
"devDependencies": {
Expand Down
1 change: 1 addition & 0 deletions test/header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
const t = require('tap')
const Header = require('../lib/header.js')

Expand Down
1 change: 1 addition & 0 deletions test/large-numbers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
const large = require('../lib/large-numbers.js')
const encode = large.encode
const parse = large.parse
Expand Down
1 change: 1 addition & 0 deletions test/make-tar.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
// a little utility to create virtual tar data
if (module === require.main)
return require('tap').pass('this is fine')
Expand Down
1 change: 1 addition & 0 deletions test/pack.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
const t = require('tap')
const Pack = require('../lib/pack.js')
const PackSync = Pack.Sync
Expand Down
1 change: 1 addition & 0 deletions test/read-entry.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
const t = require('tap')
const ReadEntry = require('../lib/read-entry.js')
const Header = require('../lib/header.js')
Expand Down
1 change: 1 addition & 0 deletions test/replace.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
const t = require('tap')
const r = require('../lib/replace.js')
const path = require('path')
Expand Down
1 change: 1 addition & 0 deletions test/update.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
'use strict'
const Buffer = require('../lib/buffer.js')
const t = require('tap')
const u = require('../lib/update.js')
const path = require('path')
Expand Down

0 comments on commit c8152e8

Please sign in to comment.