Fix incorrect sequence packet errors to be catchable

fixes #867

Author: dougwilson

Changes.md

@@ -6,6 +6,7 @@ you spot any mistakes.
 
 ## HEAD
 
+* Fix incorrect sequence packet errors to be catchable #867
 * Fix stray protocol packet errors to be catchable #867
 * Fix timing of fatal protocol errors bubbling to user #879
 

lib/protocol/Protocol.js

@@ -231,10 +231,9 @@ Protocol.prototype._parsePacket = function() {
     return;
   }
 
-  var Packet = this._determinePacket(sequence);
-  var packet = new Packet({
-    protocol41: this._config.protocol41
-  });
+  var Packet     = this._determinePacket(sequence);
+  var packet     = new Packet({protocol41: this._config.protocol41});
+  var packetName = Packet.name;
 
   // Special case: Faster dispatch, and parsing done inside sequence
   if (Packet === Packets.RowDataPacket) {
@@ -258,7 +257,17 @@ Protocol.prototype._parsePacket = function() {
   }
 
   Timers.active(sequence);
-  sequence[Packet.name](packet);
+
+  if (!sequence[packetName]) {
+    var err   = new Error('Received packet in the wrong sequence.');
+    err.code  = 'PROTOCOL_INCORRECT_PACKET_SEQUENCE';
+    err.fatal = true;
+
+    this._delegateError(err);
+    return;
+  }
+
+  sequence[packetName](packet);
 };
 
 Protocol.prototype._parsePacketDebug = function _parsePacketDebug(packet) {

test/unit/connection/test-incorrect-packet-sequence.js

@@ -0,0 +1,24 @@
+var assert     = require('assert');
+var common     = require('../../common');
+var connection = common.createConnection({port: common.fakeServerPort});
+var server     = common.createFakeServer();
+
+server.listen(common.fakeServerPort, function(err){
+  assert.ifError(err);
+
+  connection.ping(function (err) {
+    assert.ok(err, 'got error');
+    assert.equal(err.code, 'PROTOCOL_INCORRECT_PACKET_SEQUENCE');
+    assert.equal(err.fatal, true);
+    connection.destroy();
+    server.destroy();
+  });
+});
+
+server.on('connection', function (connection) {
+  connection.handshake();
+  connection.on('ping', function () {
+    this._sendPacket(new common.Packets.EofPacket());
+    this._parser.resetPacketNumber();
+  });
+});