nodemailer 6.9.0 → 6.9.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 6.9.2 2023-05-11
+
+-   Fix uncaught exception on invalid attachment content payload
+
+## 6.9.1 2023-01-27
+
+-   Fix base64 encoding for emoji bytes in encoded words
+
 ## 6.9.0 2023-01-12
 
 -   Do not throw if failed to resolve IPv4 addresses

package/lib/mime-funcs/index.js

@@ -84,6 +84,12 @@ module.exports = {
                 let lpart = '';
                 for (let i = 0, len = encodedStr.length; i < len; i++) {
                     let chr = encodedStr.charAt(i);
+
+                    if (/[\ud83c\ud83d\ud83e]/.test(chr) && i < len - 1) {
+                        // composite emoji byte, so add the next byte as well
+                        chr += encodedStr.charAt(++i);
+                    }
+
                     // check if we can add this character to the existing string
                     // without breaking byte length limit
                     if (Buffer.byteLength(lpart + chr) <= maxLength || i === 0) {

package/lib/mime-node/index.js

@@ -950,7 +950,15 @@ class MimeNode {
         if (content._resolvedValue) {
             // pass string or buffer content as a stream
             contentStream = new PassThrough();
-            setImmediate(() => contentStream.end(content._resolvedValue));
+
+            setImmediate(() => {
+                try {
+                    contentStream.end(content._resolvedValue);
+                } catch (err) {
+                    contentStream.emit('error', err);
+                }
+            });
+
             return contentStream;
         } else if (typeof content.pipe === 'function') {
             // assume as stream
@@ -974,7 +982,14 @@ class MimeNode {
         } else {
             // pass string or buffer content as a stream
             contentStream = new PassThrough();
-            setImmediate(() => contentStream.end(content || ''));
+
+            setImmediate(() => {
+                try {
+                    contentStream.end(content || '');
+                } catch (err) {
+                    contentStream.emit('error', err);
+                }
+            });
             return contentStream;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "nodemailer",
-    "version": "6.9.0",
+    "version": "6.9.2",
     "description": "Easy as cake e-mail sending from your Node.js applications",
     "main": "lib/nodemailer.js",
     "scripts": {
@@ -20,24 +20,24 @@
     },
     "homepage": "https://nodemailer.com/",
     "devDependencies": {
-        "@aws-sdk/client-ses": "3.245.0",
-        "aws-sdk": "2.1293.0",
+        "@aws-sdk/client-ses": "3.329.0",
+        "aws-sdk": "2.1376.0",
         "bunyan": "1.8.15",
         "chai": "4.3.7",
         "eslint-config-nodemailer": "1.2.0",
-        "eslint-config-prettier": "8.6.0",
-        "grunt": "1.5.3",
+        "eslint-config-prettier": "8.8.0",
+        "grunt": "1.6.1",
         "grunt-cli": "1.4.3",
-        "grunt-eslint": "24.0.1",
+        "grunt-eslint": "24.1.0",
         "grunt-mocha-test": "0.13.3",
         "libbase64": "1.2.1",
-        "libmime": "5.2.0",
+        "libmime": "5.2.1",
         "libqp": "2.0.1",
         "mocha": "10.2.0",
         "nodemailer-ntlm-auth": "1.0.3",
         "proxy": "1.0.2",
         "proxy-test-server": "1.0.0",
-        "sinon": "15.0.1",
+        "sinon": "15.0.4",
         "smtp-server": "3.11.0"
     },
     "engines": {