Fix conditionals

to avoid error on destructuring a `null` value when the header is broken.
moisseev · Dec 10, 2019 · 960d516 · 960d516
1 parent f222b4a
commit 960d516
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/chrome/content/scripts/messageHeader.js b/chrome/content/scripts/messageHeader.js
@@ -126,9 +126,9 @@ RspamdSpamness.Message.displayHeaders = function (update_rules) {
         converter.charset = "UTF-8";
         RspamdSpamness.Message.headerStr = converter.ConvertToUnicode(RspamdSpamness.Message.headerStr);
 
-        const [, s] = RspamdSpamness.Message.headerStr.match(/: \S+ \[[-\d.]+ \/ [-\d.]+\] *(.*)$/);
-        if (s) {
-            displayScoreRulesHeaders(s);
+        const m = RspamdSpamness.Message.headerStr.match(/: \S+ \[[-\d.]+ \/ [-\d.]+\] *(.*)$/);
+        if (m) {
+            displayScoreRulesHeaders(m[1]);
             return;
         }
     }
@@ -149,9 +149,9 @@ RspamdSpamness.Message.displayHeaders = function (update_rules) {
             // Get symbols from Exim header
             [RspamdSpamness.Message.headerStr] = getHeaderBody(aMimeMsg.headers, "x-spam-report");
             if (RspamdSpamness.Message.headerStr) {
-                const [, s] = RspamdSpamness.Message.headerStr.match(/^Action: [ a-z]+?(Symbol: .*)Message-ID:/);
-                if (s) {
-                    displayScoreRulesHeaders(s);
+                const m = RspamdSpamness.Message.headerStr.match(/^Action: [ a-z]+?(Symbol: .*)Message-ID:/);
+                if (m) {
+                    displayScoreRulesHeaders(m[1]);
                     return;
                 }
             }