[CONJS-193] wrong error returned "Cannot read properties of undefined…

… (reading 'charset')" when wrong handshake
mariadb-corporation · Apr 25, 2022 · 5121d6c · 5121d6c
1 parent 2ae57a9
commit 5121d6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/config/connection-options.js b/lib/config/connection-options.js
@@ -48,7 +48,7 @@ class ConnectionOptions {
       this.collation = Collations.fromName(opts.collation.toUpperCase());
       if (this.collation === undefined) throw new RangeError("Unknown collation '" + opts.collation + "'");
     } else {
-      this.collation = Collations.fromIndex(opts.charsetNumber);
+      this.collation = opts.charsetNumber ? Collations.fromIndex(opts.charsetNumber) : undefined;
     }
 
     // connection options

diff --git a/lib/connection.js b/lib/connection.js
@@ -591,7 +591,9 @@ class Connection extends EventEmitter {
     handshake.once(
       'end',
       function () {
-        if (!this.opts.collation) {
+        // this.info.collation might not be initialized
+        // in case of handshake throwing error
+        if (!this.opts.collation && this.info.collation) {
           this.opts.emit('collation', this.info.collation);
         }