diff options
| author | Rickard Green <[email protected]> | 2015-03-17 12:52:12 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-17 12:52:12 +0100 |
| commit | 23579ef1581b3a928ca37d3f74f076dfdd748d3d (patch) | |
| tree | 551ac0b0d758d42a653fb8e181a04d7c272bd12d /erts | |
| parent | fbf211e0da1eaad123ebc4434fbe316f34d0f024 (diff) | |
| parent | e74c4459c0ff9ab7504117a85b2634d5dd7df524 (diff) | |
| download | otp-23579ef1581b3a928ca37d3f74f076dfdd748d3d.tar.gz otp-23579ef1581b3a928ca37d3f74f076dfdd748d3d.tar.bz2 otp-23579ef1581b3a928ca37d3f74f076dfdd748d3d.zip | |
Merge branch 'maint'
* maint:
Make access to control_flags safe in non-smp emulator
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/beam/io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/erts/emulator/beam/io.c b/erts/emulator/beam/io.c index dc4c6fc350..9377237475 100644 --- a/erts/emulator/beam/io.c +++ b/erts/emulator/beam/io.c @@ -4085,6 +4085,9 @@ erts_port_control(Process* c_p, size, &resp_bufp, &resp_size); + + control_flags = prt->control_flags; + finalize_imm_drv_call(&try_call_state); if (tmp_alloced) erts_free(ERTS_ALC_T_TMP, bufp); @@ -4092,8 +4095,6 @@ erts_port_control(Process* c_p, return ERTS_PORT_OP_BADARG; } - control_flags = prt->control_flags; - hsz = port_control_result_size(control_flags, resp_bufp, &resp_size, |