Fix re:replace/4 to handle unicode charlist Replacement argument

A bug in re:replace/4 causes a badarg exception to be thrown when the
Replacement argument is a charlist containing non-ascii codepoints.

The problem is that the code incorrectly assumes that the Replacement
text is iodata() and calls iolist_to_binary/1 on it. This patch fixes
it to obey the 'unicode' option and handle charlist() Replacement
arguments correctly.

1 files changed, 14 insertions, 3 deletions

diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl
index f934fdcba1..889d273f6f 100644
--- a/lib/stdlib/src/re.erl
+++ b/lib/stdlib/src/re.erl
@@ -229,7 +229,19 @@ replace(Subject,RE,Replacement,Options) ->
 			iolist_to_binary(Subject)
 		end
 	end,
-    case do_replace(FlatSubject,Subject,RE,Replacement,NewOpt) of
+    FlatReplacement =
+	case is_binary(Replacement) of
+	    true ->
+		Replacement;
+	    false ->
+		case Unicode of
+		    true ->
+			unicode:characters_to_binary(Replacement,unicode);
+		    false ->
+			iolist_to_binary(Replacement)
+		end
+	end,
+    case do_replace(FlatSubject,Subject,RE,FlatReplacement,NewOpt) of
 	{error,_Err} ->
 	    throw(badre);
 	IoList ->
@@ -329,8 +341,7 @@ process_split_params([H|T],C,U,L,S,G) ->
     {[H|NT],NC,NU,NL,NS,NG}.
 
 apply_mlist(Subject,Replacement,Mlist) ->
-    do_mlist(Subject,Subject,0,precomp_repl(iolist_to_binary(Replacement)),
-	     Mlist).
+    do_mlist(Subject,Subject,0,precomp_repl(Replacement), Mlist).
 
 
 precomp_repl(<<>>) ->