aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2017-06-28 10:22:03 +0200
committerBjörn Gustavsson <[email protected]>2017-06-28 10:22:03 +0200
commitbbc8eb42959740930902b68d9a76fad424ca2e6a (patch)
treeddc372409e4d677a65f2d773943b82a2c42226c3 /erts/emulator
parent0dced656e6871e03a153bb99af10d8710ffca7d9 (diff)
parentf405b07bc6136c76a016da67dc65e5c7ec9d8f9f (diff)
downloadotp-bbc8eb42959740930902b68d9a76fad424ca2e6a.tar.gz
otp-bbc8eb42959740930902b68d9a76fad424ca2e6a.tar.bz2
otp-bbc8eb42959740930902b68d9a76fad424ca2e6a.zip
Merge branch 'bjorn/erts/fix-gen-dest' into maint
* bjorn/erts/fix-gen-dest: Eliminate potential unsafe use of general destination
Diffstat (limited to 'erts/emulator')
-rw-r--r--erts/emulator/beam/ops.tab8
1 files changed, 4 insertions, 4 deletions
diff --git a/erts/emulator/beam/ops.tab b/erts/emulator/beam/ops.tab
index cdf9cb58b9..44613c7d85 100644
--- a/erts/emulator/beam/ops.tab
+++ b/erts/emulator/beam/ops.tab
@@ -1174,9 +1174,9 @@ bs_get_binary2 Fail=f Ms=x Live=u Sz=sq Unit=u Flags=u Dst=d => \
%macro: i_bs_get_binary2 BsGetBinary_2 -fail_action
%macro: i_bs_get_binary_all2 BsGetBinaryAll_2 -fail_action
-i_bs_get_binary_imm2 f x I I I d
-i_bs_get_binary2 f x I s I d
-i_bs_get_binary_all2 f x I I d
+i_bs_get_binary_imm2 f x I I I x
+i_bs_get_binary2 f x I s I x
+i_bs_get_binary_all2 f x I I x
i_bs_get_binary_all_reuse x f I
# Fetching float from binaries.
@@ -1186,7 +1186,7 @@ bs_get_float2 Fail=f Ms=x Live=u Sz=s Unit=u Flags=u Dst=d => \
bs_get_float2 Fail=f Ms=x Live=u Sz=q Unit=u Flags=u Dst=d => jump Fail
%macro: i_bs_get_float2 BsGetFloat2 -fail_action
-i_bs_get_float2 f x I s I d
+i_bs_get_float2 f x I s I x
# Miscellanous