aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorPatrik Nyblom <[email protected]>2010-01-16 12:12:46 +0000
committerBjörn Gustavsson <[email protected]>2010-01-27 12:27:35 +0100
commit1d2a481cfd016f204183b44d8f95798161b423e3 (patch)
treeb5fc6cfbf2b3e12c0f45cbb9b2118bb2802af252 /erts/emulator
parent98cb178fe80be7ee560c16e02dc31bf3df7700c8 (diff)
downloadotp-1d2a481cfd016f204183b44d8f95798161b423e3.tar.gz
otp-1d2a481cfd016f204183b44d8f95798161b423e3.tar.bz2
otp-1d2a481cfd016f204183b44d8f95798161b423e3.zip
Fix re:replace/4 to handle unicode charlist RE argument
The real problem is in the re:run/3 BIF. Noticed-by: Rory Byrne Tests-by: Rory Byrne
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/erl_bif_re.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_bif_re.c b/erts/emulator/beam/erl_bif_re.c
index 6efc19597b..c027cd5984 100644
--- a/erts/emulator/beam/erl_bif_re.c
+++ b/erts/emulator/beam/erl_bif_re.c
@@ -884,7 +884,7 @@ re_run_3(BIF_ALIST_3)
int capture_count;
if (pflags & PARSE_FLAG_UNICODE &&
- (!is_binary(BIF_ARG_1) ||
+ (!is_binary(BIF_ARG_2) || !is_binary(BIF_ARG_1) ||
(is_list_cap && !(pflags & PARSE_FLAG_GLOBAL)))) {
BIF_TRAP3(urun_trap_exportp, BIF_P, BIF_ARG_1, BIF_ARG_2, BIF_ARG_3);
}