aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorZandra Hird <[email protected]>2015-03-20 14:55:01 +0100
committerZandra Hird <[email protected]>2015-03-20 14:55:18 +0100
commitb4a9bc73058e9d934143d41e766722f3e3b3d758 (patch)
tree56c1a53aa08842f42b148b3f627a48c3e1e2247e /erts/emulator/beam
parentc0b559c6a0cf6fa9ff7215df59a71b7fa054ed85 (diff)
parent6f9c07ae2694a2dc1f721fd10af22b8813d15bc1 (diff)
downloadotp-b4a9bc73058e9d934143d41e766722f3e3b3d758.tar.gz
otp-b4a9bc73058e9d934143d41e766722f3e3b3d758.tar.bz2
otp-b4a9bc73058e9d934143d41e766722f3e3b3d758.zip
Merge branch 'nox/fix-port_info-race' into maint
* nox/fix-port_info-race: Fix a race condition when calling port_info/1 OTP-12587
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c
index be34c6effc..7c6696405b 100644
--- a/erts/emulator/beam/io.c
+++ b/erts/emulator/beam/io.c
@@ -4485,7 +4485,7 @@ make_port_info_term(Eterm **hpp_start,
int len;
int start;
static Eterm item[] = ERTS_PORT_INFO_1_ITEMS;
- static Eterm value[sizeof(item)/sizeof(item[0])];
+ Eterm value[sizeof(item)/sizeof(item[0])];
start = 0;
len = sizeof(item)/sizeof(item[0]);