Parse default field of field packet correctly

Author: dougwilson

Changes.md

@@ -13,6 +13,7 @@ you spot any mistakes.
 * Add `timeout` option to all sequences #855 #863
 * Default `connectTimeout` to 10 seconds
 * Fix domain binding with `conn.connect`
+* Fix `packet.default` to actually be a string
 * Fix `PROTOCOL_PACKETS_OUT_OF_ORDER` error to be catchable #844
 * Return `Query` object from `pool.query` like `conn.query` #830
 * Use `EventEmitter.listenerCount` when possible for faster counting

lib/protocol/Parser.js

@@ -166,7 +166,11 @@ Parser.prototype.parseLengthCodedBuffer = function() {
   return this.parseBuffer(length);
 };
 
-Parser.prototype.parseLengthCodedNumber = function() {
+Parser.prototype.parseLengthCodedNumber = function parseLengthCodedNumber() {
+  if (this._offset >= this._buffer.length) {
+    throw new Error('Parser: read past end');
+  }
+
   var bits = this._buffer[this._offset++];
 
   if (bits <= 250) {

lib/protocol/packets/FieldPacket.js

@@ -8,13 +8,11 @@ function FieldPacket(options) {
   this.orgTable   = options.orgTable;
   this.name       = options.name;
   this.orgName    = options.orgName;
-  this.filler1    = undefined;
   this.charsetNr  = options.charsetNr;
   this.length     = options.length;
   this.type       = options.type;
   this.flags      = options.flags;
   this.decimals   = options.decimals;
-  this.filler2    = undefined;
   this.default    = options.default;
   this.zeroFill   = options.zeroFill;
   this.protocol41 = options.protocol41
@@ -28,13 +26,21 @@ FieldPacket.prototype.parse = function(parser) {
     this.orgTable    = parser.parseLengthCodedString();
     this.name        = parser.parseLengthCodedString();
     this.orgName     = parser.parseLengthCodedString();
-    this.filler1     = parser.parseFiller(1);
+
+    if (parser.parseLengthCodedNumber() !== 0x0c) {
+      throw new TypeError('Received invalid field length');
+    }
+
     this.charsetNr   = parser.parseUnsignedNumber(2);
     this.length      = parser.parseUnsignedNumber(4);
     this.type        = parser.parseUnsignedNumber(1);
     this.flags       = parser.parseUnsignedNumber(2);
     this.decimals    = parser.parseUnsignedNumber(1);
-    this.filler2     = parser.parseFiller(2);
+
+    var filler       = parser.parseBuffer(2);
+    if (filler[0] !== 0x0 || filler[1] !== 0x0) {
+      throw new TypeError('Received invalid filler');
+    }
 
     // parsed flags
     this.zeroFill    = (this.flags & 0x0040 ? true : false);
@@ -43,7 +49,7 @@ FieldPacket.prototype.parse = function(parser) {
       return;
     }
 
-    this.default     = parser.parseLengthCodedNumber();
+    this.default     = parser.parseLengthCodedString();
   } else {
     this.table       = parser.parseLengthCodedString();
     this.name        = parser.parseLengthCodedString();
@@ -60,7 +66,8 @@ FieldPacket.prototype.write = function(writer) {
     writer.writeLengthCodedString(this.orgTable);
     writer.writeLengthCodedString(this.name);
     writer.writeLengthCodedString(this.orgName);
-    writer.writeFiller(1);
+
+    writer.writeLengthCodedNumber(0x0c);
     writer.writeUnsignedNumber(2, this.charsetNr || 0);
     writer.writeUnsignedNumber(4, this.length || 0);
     writer.writeUnsignedNumber(1, this.type || 0);

test/FakeServer.js

@@ -130,6 +130,7 @@ FakeConnection.prototype._handleQueryPacket = function _handleQueryPacket(packet
     this._sendPacket(new Packets.FieldPacket({
       catalog    : 'def',
       charsetNr  : Charsets.UTF8_GENERAL_CI,
+      default    : '0',
       name       : num,
       protocol41 : true,
       type       : Types.LONG