Fix merge conflicts

Author: cressie176

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Unreleased
 - Remove bitsyntax dependency - See https://github.com/amqp-node/amqplib/pull/785. Thanks @ikenfin
+<<<<<<< HEAD
+=======
+- Stop checking if frame max is exceeded when parsing frames - See https://github.com/amqp-node/amqplib/pull/784. Thanks @ohroy
+>>>>>>> ohroy-main
 
 ## v0.10.6
 - Replace references to the old squaremo/amqp.name repo with ones to amqp-node/amqplib

lib/connection.js

@@ -553,7 +553,7 @@ class Connection extends EventEmitter {
 
   recvFrame () {
     // %%% identifying invariants might help here?
-    var frame = parseFrame(this.rest, this.frameMax);
+    var frame = parseFrame(this.rest);
 
     if (!frame) {
       var incoming = this.stream.read();

lib/frame.js

@@ -99,7 +99,7 @@ module.exports.makeBodyFrame = function (channel, payload) {
  * @arg { number } max
  * @returns { FrameStructure | boolean }
  */
-function parseFrame(bin, max) {
+function parseFrame(bin) {
   if (bin.length < FRAME_HEADER_BYTES) {
     return false
   }
@@ -108,10 +108,6 @@ function parseFrame(bin, max) {
   const channel = bin.readUInt16BE(1)
   const size = bin.readUInt32BE(3)
 
-  if (size > max) {
-    throw new Error('Frame size exceeds frame max');
-  }
-
   const totalSize = FRAME_HEADER_BYTES + size + FRAME_END_BYTES
 
   if (bin.length < totalSize) {
@@ -176,4 +172,4 @@ module.exports.HEARTBEAT_BUF = Buffer.from([constants.FRAME_HEARTBEAT,
                                            0, 0, // channel = 0
                                            constants.FRAME_END]);
 
-module.exports.HEARTBEAT = HEARTBEAT;
+module.exports.HEARTBEAT = HEARTBEAT;

test/frame.js

@@ -69,12 +69,6 @@ suite("Explicit parsing", function() {
                   0,0,0,0, // garbage ID
                   defs.constants.FRAME_END]);
 
-  testBogusFrame('> max frame',
-                 [defs.constants.FRAME_BODY,
-                  0,0, 0,0,0,6, // too big!
-                  65,66,67,68,69,70,
-                  defs.constants.FRAME_END]);
-
 });
 
 // Now for a bit more fun.