zlib: avoid converting Uint8Array instances to Buffer

PR-URL: #39492 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Zeyu Yang <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Sep 4, 2021 · 61b4a98 · 61b4a98
1 parent 61261cd
commit 61b4a98
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/zlib.js b/lib/zlib.js
@@ -34,7 +34,6 @@ const {
   ObjectDefineProperties,
   ObjectDefineProperty,
   ObjectFreeze,
-  ObjectGetPrototypeOf,
   ObjectKeys,
   ObjectSetPrototypeOf,
   ReflectApply,
@@ -60,7 +59,8 @@ const {
 } = require('internal/util');
 const {
   isArrayBufferView,
-  isAnyArrayBuffer
+  isAnyArrayBuffer,
+  isUint8Array,
 } = require('internal/util/types');
 const binding = internalBinding('zlib');
 const assert = require('internal/assert');
@@ -109,10 +109,9 @@ for (const ckey of ObjectKeys(codes)) {
 function zlibBuffer(engine, buffer, callback) {
   if (typeof callback !== 'function')
     throw new ERR_INVALID_ARG_TYPE('callback', 'function', callback);
-  // Streams do not support non-Buffer ArrayBufferViews yet. Convert it to a
+  // Streams do not support non-Uint8Array ArrayBufferViews yet. Convert it to a
   // Buffer without copying.
-  if (isArrayBufferView(buffer) &&
-      ObjectGetPrototypeOf(buffer) !== Buffer.prototype) {
+  if (isArrayBufferView(buffer) && !isUint8Array(buffer)) {
     buffer = Buffer.from(buffer.buffer, buffer.byteOffset, buffer.byteLength);
   } else if (isAnyArrayBuffer(buffer)) {
     buffer = Buffer.from(buffer);