Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 523929c

Browse files
Emmanuel Odeketrevnorris
Emmanuel Odeke
authored andcommitted
repl: Private Buffer object in lib/* files
Fixes usage of global object 'Buffer' in lib/* files by ensuring that each file does an explicit require('buffer').Buffer. Previously, when running a repl, due to usage of global 'Buffer', any redefinition of Buffer would cause a crash eg var Buffer = {}. Fixes: #8588 PR-URL: #8603 Reviewed-by: Trevor Norris <[email protected]>
1 parent ea69dd7 commit 523929c

10 files changed

+11
-1
lines changed

lib/_stream_readable.js

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ Readable.ReadableState = ReadableState;
2424

2525
var EE = require('events').EventEmitter;
2626
var Stream = require('stream');
27+
var Buffer = require('buffer').Buffer;
2728
var util = require('util');
2829
var StringDecoder;
2930

lib/_stream_writable.js

+1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Writable.WritableState = WritableState;
2828

2929
var util = require('util');
3030
var Stream = require('stream');
31+
var Buffer = require('buffer').Buffer;
3132

3233
util.inherits(Writable, Stream);
3334

lib/assert.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
// UTILITY
2626
var util = require('util');
27+
var b = require('buffer');
2728
var pSlice = Array.prototype.slice;
2829

2930
// 1. The assert module provides functions that throw
@@ -144,7 +145,7 @@ function _deepEqual(actual, expected) {
144145
if (actual === expected) {
145146
return true;
146147

147-
} else if (Buffer.isBuffer(actual) && Buffer.isBuffer(expected)) {
148+
} else if (b.Buffer.isBuffer(actual) && b.Buffer.isBuffer(expected)) {
148149
if (actual.length != expected.length) return false;
149150

150151
for (var i = 0; i < actual.length; i++) {

lib/dgram.js

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
var assert = require('assert');
2323
var util = require('util');
2424
var events = require('events');
25+
var Buffer = require('buffer').Buffer;
2526

2627
var UDP = process.binding('udp_wrap').UDP;
2728

lib/fs.js

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ var pathModule = require('path');
3131
var binding = process.binding('fs');
3232
var constants = process.binding('constants');
3333
var fs = exports;
34+
var Buffer = require('buffer').Buffer;
3435
var Stream = require('stream').Stream;
3536
var EventEmitter = require('events').EventEmitter;
3637

lib/http.js

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ var net = require('net');
2424
var Stream = require('stream');
2525
var timers = require('timers');
2626
var url = require('url');
27+
var Buffer = require('buffer').Buffer;
2728
var EventEmitter = require('events').EventEmitter;
2829
var FreeList = require('freelist').FreeList;
2930
var HTTPParser = process.binding('http_parser').HTTPParser;

lib/net.js

+1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var timers = require('timers');
2525
var util = require('util');
2626
var assert = require('assert');
2727
var cares = process.binding('cares_wrap');
28+
var Buffer = require('buffer').Buffer;
2829
var cluster;
2930

3031
function noop() {}

lib/readline.js

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ var kHistorySize = 30;
2929
var kBufSize = 10 * 1024;
3030

3131
var util = require('util');
32+
var Buffer = require('buffer').Buffer;
3233
var inherits = require('util').inherits;
3334
var EventEmitter = require('events').EventEmitter;
3435

lib/tls.js

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var url = require('url');
2626
var events = require('events');
2727
var stream = require('stream');
2828
var assert = require('assert').ok;
29+
var Buffer = require('buffer').Buffer;
2930
var constants = require('constants');
3031

3132
var Timer = process.binding('timer_wrap').Timer;

lib/zlib.js

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ var Transform = require('_stream_transform');
2323

2424
var binding = process.binding('zlib');
2525
var util = require('util');
26+
var Buffer = require('buffer').Buffer;
2627
var assert = require('assert').ok;
2728

2829
// zlib doesn't provide these, so kludge them in following the same

0 commit comments

Comments
 (0)