Skip to content

Commit b5b8ff1

Browse files
committed
lib: don't use global Buffer
Port of nodejs/node-v0.x-archive#8603 The race condition present in the original PR didn't occur, so no workaround was needed. PR-URL: #1794 Reviewed-By: Trevor Norris <trev.norris@gmail.com>
1 parent ff8202c commit b5b8ff1

21 files changed

+22
-0
lines changed

lib/_debugger.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ const repl = Module.requireRepl();
99
const inherits = util.inherits;
1010
const assert = require('assert');
1111
const spawn = require('child_process').spawn;
12+
const Buffer = require('buffer').Buffer;
1213

1314
exports.start = function(argv, stdin, stdout) {
1415
argv || (argv = process.argv.slice(2));

lib/_http_client.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ const freeParser = common.freeParser;
1313
const debug = common.debug;
1414
const OutgoingMessage = require('_http_outgoing').OutgoingMessage;
1515
const Agent = require('_http_agent');
16+
const Buffer = require('buffer').Buffer;
1617

1718

1819
function ClientRequest(options, cb) {

lib/_http_outgoing.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const assert = require('assert').ok;
44
const Stream = require('stream');
55
const timers = require('timers');
66
const util = require('util');
7+
const Buffer = require('buffer').Buffer;
78
const common = require('_http_common');
89

910
const CRLF = common.CRLF;

lib/_stream_readable.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Readable.ReadableState = ReadableState;
55

66
const EE = require('events').EventEmitter;
77
const Stream = require('stream');
8+
const Buffer = require('buffer').Buffer;
89
const util = require('util');
910
const debug = util.debuglog('stream');
1011
var StringDecoder;

lib/_stream_writable.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ Writable.WritableState = WritableState;
99

1010
const util = require('util');
1111
const Stream = require('stream');
12+
const Buffer = require('buffer').Buffer;
1213

1314
util.inherits(Writable, Stream);
1415

lib/_tls_legacy.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ const tls = require('tls');
77
const util = require('util');
88
const common = require('_tls_common');
99
const debug = util.debuglog('tls-legacy');
10+
const Buffer = require('buffer').Buffer;
1011
const Timer = process.binding('timer_wrap').Timer;
1112
var Connection = null;
1213
try {

lib/_tls_wrap.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const util = require('util');
88
const listenerCount = require('events').listenerCount;
99
const common = require('_tls_common');
1010
const StreamWrap = require('_stream_wrap').StreamWrap;
11+
const Buffer = require('buffer').Buffer;
1112
const Duplex = require('stream').Duplex;
1213
const debug = util.debuglog('tls');
1314
const Timer = process.binding('timer_wrap').Timer;

lib/assert.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
// UTILITY
2828
const compare = process.binding('buffer').compare;
2929
const util = require('util');
30+
const Buffer = require('buffer').Buffer;
3031
const pSlice = Array.prototype.slice;
3132

3233
// 1. The assert module provides functions that throw

lib/child_process.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ const constants = require('constants');
66

77
const uv = process.binding('uv');
88
const spawn_sync = process.binding('spawn_sync');
9+
const Buffer = require('buffer').Buffer;
910
const Pipe = process.binding('pipe_wrap').Pipe;
1011
const child_process = require('internal/child_process');
1112

lib/crypto.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ try {
1515
throw new Error('node.js not compiled with openssl crypto support.');
1616
}
1717

18+
const Buffer = require('buffer').Buffer;
1819
const constants = require('constants');
1920
const stream = require('stream');
2021
const util = require('util');

0 commit comments

Comments
 (0)