Fix double-transcoding of XML-escaped characters in String#{encode,encode!}.

PullRequest: truffleruby/550

Author: nirvdrum

CHANGELOG.md

@@ -4,6 +4,8 @@ Bug fixes:
 
 * Fixed a bug with `String#lines` and similar methods with multibyte
   characters (#1543).
+* Fixed an issue with `String#{encode,encode!}` double-processing strings
+  using XML conversion options and a new destination encoding (#1545).
 
 Compatibility:
 

spec/tags/core/string/encode_tags.txt

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved. This
+# Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
 #
@@ -454,7 +454,7 @@ def encode!(to=undefined, from=undefined, options=undefined)
         dest = +''
         status = ec.primitive_convert self.dup, dest, nil, nil, ec.options
         raise ec.last_error unless status == :finished
-        replace dest
+        return replace(dest)
       elsif options == 0
         force_encoding to_enc
       end