Skip to content

Commit

Permalink
repl: Private Buffer object in lib/* files
Browse files Browse the repository at this point in the history
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: nodejs/node-v0.x-archive#8588
PR-URL: nodejs/node-v0.x-archive#8603
Reviewed-by: Trevor Norris <[email protected]>

Conflicts:
	lib/_stream_readable.js
	lib/_stream_writable.js
	lib/assert.js
	lib/dgram.js
	lib/fs.js
	lib/http.js
	lib/net.js
	lib/readline.js
	lib/tls.js
	lib/zlib.js
  • Loading branch information
Emmanuel Odeke authored and Fishrock123 committed May 22, 2015
1 parent 773cbc0 commit 7532d24
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 0 deletions.
1 change: 1 addition & 0 deletions lib/_stream_readable.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Readable.ReadableState = ReadableState;

const EE = require('events').EventEmitter;
const Stream = require('stream');
const Buffer = require('buffer').Buffer;
const util = require('util');
const debug = util.debuglog('stream');
var StringDecoder;
Expand Down
1 change: 1 addition & 0 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Writable.WritableState = WritableState;

const util = require('util');
const Stream = require('stream');
const Buffer = require('buffer').Buffer;

util.inherits(Writable, Stream);

Expand Down
1 change: 1 addition & 0 deletions lib/assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
// UTILITY
const compare = process.binding('buffer').compare;
const util = require('util');
const Buffer = require('buffer').Buffer;
const pSlice = Array.prototype.slice;

// 1. The assert module provides functions that throw
Expand Down
1 change: 1 addition & 0 deletions lib/dgram.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const assert = require('assert');
const util = require('util');
const events = require('events');
const Buffer = require('buffer').Buffer;
const constants = require('constants');

const UDP = process.binding('udp_wrap').UDP;
Expand Down
1 change: 1 addition & 0 deletions lib/fs.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ const pathModule = require('path');
const binding = process.binding('fs');
const constants = require('constants');
const fs = exports;
const Buffer = require('buffer').Buffer;
const Stream = require('stream').Stream;
const EventEmitter = require('events').EventEmitter;
const FSReqWrap = binding.FSReqWrap;
Expand Down
1 change: 1 addition & 0 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const timers = require('timers');
const util = require('util');
const assert = require('assert');
const cares = process.binding('cares_wrap');
const Buffer = require('buffer').Buffer;
const uv = process.binding('uv');

const TTYWrap = process.binding('tty_wrap');
Expand Down
1 change: 1 addition & 0 deletions lib/readline.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
const kHistorySize = 30;

const util = require('util');
const Buffer = require('buffer').Buffer;
const inherits = util.inherits;
const EventEmitter = require('events').EventEmitter;

Expand Down
1 change: 1 addition & 0 deletions lib/tls.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const net = require('net');
const url = require('url');
const util = require('util');
const binding = process.binding('crypto');
const Buffer = require('buffer').Buffer;

// Allow {CLIENT_RENEG_LIMIT} client-initiated session renegotiations
// every {CLIENT_RENEG_WINDOW} seconds. An error event is emitted if more
Expand Down
1 change: 1 addition & 0 deletions lib/zlib.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
const Transform = require('_stream_transform');
const binding = process.binding('zlib');
const util = require('util');
const Buffer = require('buffer').Buffer;
const assert = require('assert').ok;

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

0 comments on commit 7532d24

Please sign in to comment.