Merge pull request #915 from miroslavLalev/query-error

(fix/query): Row parsing could lead to uncaught errors

lib/commands/query.js

@@ -222,12 +222,18 @@ class Query extends Command {
       }
       return this.done();
     }
-    const row = new this._rowParser(
-      packet,
-      this._fields[this._resultIndex],
-      this.options,
-      CharsetToEncoding
-    );
+    let row;
+    try {
+      row = new this._rowParser(
+        packet,
+        this._fields[this._resultIndex],
+        this.options,
+        CharsetToEncoding
+      );
+    } catch (err) {
+      this._localStreamError = err;
+      return this.doneInsert(null);
+    }
     if (this.onResult) {
       this._rows[this._resultIndex].push(row);
     } else {

test/unit/commands/test-query.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const assert = require('assert');
+const Query = require('../../../lib/commands/query');
+
+const testError = new Error('something happened');
+const testQuery = new Query({}, (err, res) => {
+  assert.equal(err, testError);
+  assert.equal(res, null);
+});
+
+testQuery._rowParser = class FailingRowParser {
+  constructor() {
+    throw testError;
+  }
+};
+
+testQuery.row({
+  isEOF: () => false
+});