https://github.com/sam-github/vpim/pull/20

whitebearded · Feb 27, 2018 · 95314f0 · 95314f0
1 parent 5002482
commit 95314f0
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/lib/vpim/rfc2425.rb b/lib/vpim/rfc2425.rb
@@ -290,19 +290,21 @@ def Vpim.decode_text_list(value, sep = ',') # :nodoc:
   # paramtext  = *SAFE-CHAR
   # quoted-string      = DQUOTE *QSAFE-CHAR DQUOTE
   def Vpim.encode_paramtext(value)
-    case value
-    when %r{\A#{Bnf::SAFECHAR}*\z}
+    bin_value = value.dup.force_encoding('ASCII-8BIT')
+    case bin_value
+    when %r{\A#{Bnf::SAFECHAR}*\z}n
       value
     else
       raise Vpim::Unencodeable, "paramtext #{value.inspect}"
     end
   end
 
-  def Vpim.encode_paramvalue(value)
-    case value
-    when %r{\A#{Bnf::SAFECHAR}*\z}
+   def Vpim.encode_paramvalue(value)
+    bin_value = value.dup.force_encoding('ASCII-8BIT')
+    case bin_value
+    when %r{\A#{Bnf::SAFECHAR}*\z}n
       value
-    when %r{\A#{Bnf::QSAFECHAR}*\z}
+    when %r{\A#{Bnf::QSAFECHAR}*\z}n
       '"' + value + '"'
     else
       raise Vpim::Unencodeable, "param-value #{value.inspect}"