mail 2.9.0 → 2.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19bd6b0f4442e909c23a9b7da4aecd758bc7f13f49f55b0d38cbcea5d18a91bf
-  data.tar.gz: 30187e6fef5ff7d5aaa6e1608bac3f74748946b6aa84f63bc0152b14f8ec0f70
+  metadata.gz: f4a67f21ae487544b4e5643f58bbeefc655aeeb71a8a6b1296f70a3772e45e58
+  data.tar.gz: 7db8b4d4900cb78bb51a4384f0415deb80253df509b22f55073289dea07021c3
 SHA512:
-  metadata.gz: 1d0fca43599584febff0aee7cc250a9280005080a9274024fa011b99ab27e4d40ebf72161c60d7115641d844d560f34b87e07994b485c6c0ae2cbd102cd04b11
-  data.tar.gz: 47735a46f1117a0d9709a3b72db5030ea71c645418a60b8fb62637777c9cdd687079fca33f77dfc4388aa5f8d4136768a555890d1f88768b351b81aaea9ab486
+  metadata.gz: fe249426a2cb09c463dae570a5a9d13a19e6e9ffcce643f766102da9033ec69bec69642834a29069ade3909e39962abdfb818eba539fe4a1322a2812e9242c93
+  data.tar.gz: 146e604d9cfa857f0485485839ab64334656dd287d059d9fa17d5dd5e71d980c5df4b081b148c99c2d3f841eacfa439aaa0c1e0ab9658181ea57357ba17f41cf

data/lib/mail/utilities.rb

@@ -416,16 +416,20 @@ module Mail
     end
 
     def Utilities.b_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Bb]\?(.*)\?\=/m)
-      if match
-        charset = match[1]
-        str = Utilities.decode_base64(match[2])
-        str = charset_encoder.encode(str, charset)
+      b_decoded = str.gsub(/=\?([^?]+)\?[Bb]\?([^?]*)\?=/m) do |match|
+        charset = $1
+
+        string = Utilities.decode_base64($2)
+
+        begin
+          charset_encoder.encode(string, charset)
+        rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError, Encoding::InvalidByteSequenceError
+          warn "WARNING: Encoding conversion failed #{$!}"
+          string.dup.force_encoding(Encoding::UTF_8)
+        end
       end
-      transcode_to_scrubbed_utf8(str)
-    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError, Encoding::InvalidByteSequenceError
-      warn "WARNING: Encoding conversion failed #{$!}"
-      str.dup.force_encoding(Encoding::UTF_8)
+
+      transcode_to_scrubbed_utf8(b_decoded)
     end
 
     def Utilities.q_value_encode(str, encoding = nil)
@@ -434,22 +438,28 @@ module Mail
     end
 
     def Utilities.q_value_decode(str)
-      match = str.match(/\=\?(.+)?\?[Qq]\?(.*)\?\=/m)
-      if match
-        charset = match[1]
-        string = match[2].gsub(/_/, '=20')
-        # Remove trailing = if it exists in a Q encoding
-        string = string.sub(/\=$/, '')
-        str = Encodings::QuotedPrintable.decode(string)
-        str = charset_encoder.encode(str, charset)
+      q_decoded = str.gsub(/=\?([^?]+)\?[Qq]\?((?:[^?]|\?(?!\=))*)\?=/m) do |_match|
+        charset = $1
+        string  = $2
+          .gsub(/_/, '=20')
+          .sub(/\=$/, '') # Remove trailing = if it exists in a Q encoding
+
+        unquoted_printable = Encodings::QuotedPrintable.decode(string)
+        decoded = begin
+                    charset_encoder.encode(unquoted_printable, charset)
+                  rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
+                    warn "WARNING: Encoding conversion failed #{$!}"
+                    unquoted_printable.dup.force_encoding(Encoding::UTF_8)
+                  end
+
         # We assume that binary strings hold utf-8 directly to work around
         # jruby/jruby#829 which subtly changes String#encode semantics.
-        str.force_encoding(Encoding::UTF_8) if str.encoding == Encoding::ASCII_8BIT
+        decoded.force_encoding(Encoding::UTF_8) if decoded.encoding == Encoding::ASCII_8BIT
+
+        decoded
       end
-      transcode_to_scrubbed_utf8(str)
-    rescue Encoding::UndefinedConversionError, ArgumentError, Encoding::ConverterNotFoundError
-      warn "WARNING: Encoding conversion failed #{$!}"
-      str.dup.force_encoding(Encoding::UTF_8)
+
+      transcode_to_scrubbed_utf8(q_decoded)
     end
 
     def Utilities.param_decode(str, encoding)

data/lib/mail/version.rb

@@ -4,7 +4,7 @@ module Mail
 
     MAJOR = 2
     MINOR = 9
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join('.')

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: mail
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.9.1
 platform: ruby
 authors:
 - Mikel Lindsaar
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-22 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger
@@ -310,7 +309,6 @@ homepage: https://github.com/mikel/mail
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options:
 - "--exclude"
 - lib/mail/values/unicode_tables.dat
@@ -327,8 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Mail provides a nice Ruby DSL for making, sending and reading emails.
 test_files: []