lib: use Buffer.isBuffer() consistently

TimothyGu · Sep 21, 2017 · 2eab4f8 · 2eab4f8
1 parent 4fceb19
commit 2eab4f8
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/lib/_http_outgoing.js b/lib/_http_outgoing.js
@@ -645,7 +645,7 @@ function write_(msg, chunk, encoding, callback, fromEnd) {
     return true;
   }
 
-  if (!fromEnd && typeof chunk !== 'string' && !(chunk instanceof Buffer)) {
+  if (!fromEnd && typeof chunk !== 'string' && !Buffer.isBuffer(chunk)) {
     throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'first argument',
                                ['string', 'buffer']);
   }
@@ -743,7 +743,7 @@ OutgoingMessage.prototype.end = function end(chunk, encoding, callback) {
 
   var uncork;
   if (chunk) {
-    if (typeof chunk !== 'string' && !(chunk instanceof Buffer)) {
+    if (typeof chunk !== 'string' && !Buffer.isBuffer(chunk)) {
       throw new errors.TypeError('ERR_INVALID_ARG_TYPE', 'first argument',
                                  ['string', 'buffer']);
     }

diff --git a/lib/buffer.js b/lib/buffer.js
@@ -567,15 +567,15 @@ Buffer.byteLength = byteLength;
 Object.defineProperty(Buffer.prototype, 'parent', {
   enumerable: true,
   get() {
-    if (!(this instanceof Buffer))
+    if (!Buffer.isBuffer(this))
       return undefined;
     return this.buffer;
   }
 });
 Object.defineProperty(Buffer.prototype, 'offset', {
   enumerable: true,
   get() {
-    if (!(this instanceof Buffer))
+    if (!Buffer.isBuffer(this))
       return undefined;
     return this.byteOffset;
   }

diff --git a/lib/fs.js b/lib/fs.js
@@ -2198,7 +2198,7 @@ WriteStream.prototype.open = function() {
 
 
 WriteStream.prototype._write = function(data, encoding, cb) {
-  if (!(data instanceof Buffer))
+  if (!Buffer.isBuffer(data))
     return this.emit('error', new Error('Invalid data'));
 
   if (typeof this.fd !== 'number') {

diff --git a/lib/net.js b/lib/net.js
@@ -694,7 +694,7 @@ protoGetter('localPort', function localPort() {
 
 
 Socket.prototype.write = function(chunk, encoding, cb) {
-  if (typeof chunk !== 'string' && !(chunk instanceof Buffer)) {
+  if (typeof chunk !== 'string' && !Buffer.isBuffer(chunk)) {
     throw new TypeError(
       'Invalid data, chunk must be a string or buffer, not ' + typeof chunk);
   }
@@ -752,7 +752,7 @@ Socket.prototype._writeGeneric = function(writev, data, encoding, cb) {
     if (err === 0) req._chunks = chunks;
   } else {
     var enc;
-    if (data instanceof Buffer) {
+    if (Buffer.isBuffer(data)) {
       enc = 'buffer';
     } else {
       enc = encoding;
@@ -821,7 +821,7 @@ protoGetter('bytesWritten', function bytesWritten() {
     return undefined;
 
   state.getBuffer().forEach(function(el) {
-    if (el.chunk instanceof Buffer)
+    if (Buffer.isBuffer(el.chunk))
       bytes += el.chunk.length;
     else
       bytes += Buffer.byteLength(el.chunk, el.encoding);
@@ -832,7 +832,7 @@ protoGetter('bytesWritten', function bytesWritten() {
     for (var i = 0; i < data.length; i++) {
       const chunk = data[i];
 
-      if (data.allBuffers || chunk instanceof Buffer)
+      if (data.allBuffers || Buffer.isBuffer(chunk))
         bytes += chunk.length;
       else
         bytes += Buffer.byteLength(chunk.chunk, chunk.encoding);

diff --git a/lib/readline.js b/lib/readline.js
@@ -973,7 +973,7 @@ Interface.prototype._ttyWrite = function(s, key) {
         // falls through
 
       default:
-        if (s instanceof Buffer)
+        if (Buffer.isBuffer(s))
           s = s.toString('utf-8');
 
         if (s) {