Merge pull request #41 from justcfx2u/master

Fall back if string cannot be encoded
2012-08-28 15:53:15 -07:00 · 2012-08-28 15:53:15 -07:00 · ccd7b6da5b
parent 8acd4acc5b 656039cee0
commit ccd7b6da5b
1 changed files with 5 additions and 1 deletions
--- a/lib/net/ber/core_ext/string.rb
+++ b/lib/net/ber/core_ext/string.rb
@ -28,7 +28,11 @@ module Net::BER::Extensions::String
    if self.respond_to?(:encode)
      # Strings should be UTF-8 encoded according to LDAP.
      # However, the BER code is not necessarily valid UTF-8
-      self.encode('UTF-8').force_encoding('ASCII-8BIT')
+      begin
+        self.encode('UTF-8').force_encoding('ASCII-8BIT')
+      rescue Encoding::UndefinedConversionError
+        self
+      end
    else
      self
    end