Merge pull request #75 from chef/lcg/fix-force-encoding

fix validate_utf8: false encoding coercion

1 files changed, 15 insertions, 2 deletions

diff --git a/lib/ffi_yajl/encoder.rb b/lib/ffi_yajl/encoder.rb
index f4dd8c8..3b07e95 100644
--- a/lib/ffi_yajl/encoder.rb
+++ b/lib/ffi_yajl/encoder.rb
@@ -41,7 +41,15 @@ module FFI_Yajl
       # call either the ext or ffi hook
       str = do_yajl_encode(obj, yajl_gen_opts, opts)
       # we can skip cleaning the whole string for utf-8 issues if we have yajl validate as we go
-      str.encode!("utf-8", "binary", undef: :replace) unless yajl_gen_opts[:yajl_gen_validate_utf8]
+
+      str.force_encoding("UTF-8")
+      unless yajl_gen_opts[:yajl_gen_validate_utf8]
+        if str.respond_to?(:scrub)
+          str.scrub!
+        else
+          str.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
+        end
+      end
       str
     end
 
@@ -56,7 +64,12 @@ module FFI_Yajl
 
     def self.raise_error_for_status(status, token = nil)
       # scrub token to valid utf-8 since we may be issuing an exception on an invalid utf-8 token
-      token = token.to_s.encode("utf-8", "binary", undef: :replace)
+      token = token.to_s.force_encoding("UTF-8")
+      if token.respond_to?(:scrub)
+        token.scrub!
+      else
+        token.encode!("UTF-16le", undef: :replace, invalid: :replace).encode!('UTF-8')
+      end
       case status
       when 1 # yajl_gen_keys_must_be_strings
         raise FFI_Yajl::EncodeError, "YAJL internal error: attempted use of non-string object as key"