diff options
| author | Sverker Eriksson <[email protected]> | 2017-10-17 17:01:58 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2017-10-17 17:01:58 +0200 |
| commit | 03fa17e92d3baf9334e137b3bff5a3ce10b5ba2a (patch) | |
| tree | 1dad637e651a676936b8c4822726a6b405dc0b02 /erts | |
| parent | 30c3930fb296f46bac334cb6a5856a747984f69d (diff) | |
| parent | 26797db89c0b36757eb538bb7ec2ef8b9e29746a (diff) | |
| download | otp-03fa17e92d3baf9334e137b3bff5a3ce10b5ba2a.tar.gz otp-03fa17e92d3baf9334e137b3bff5a3ce10b5ba2a.tar.bz2 otp-03fa17e92d3baf9334e137b3bff5a3ce10b5ba2a.zip | |
Merge branch 'maint'
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/emulator/drivers/common/inet_drv.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c index 7b1f4a0e9c..554c48059f 100644 --- a/erts/emulator/drivers/common/inet_drv.c +++ b/erts/emulator/drivers/common/inet_drv.c @@ -2199,13 +2199,16 @@ static int inet_reply_ok(inet_descriptor* desc) ErlDrvTermData caller = desc->caller; int i = 0; + desc->caller = 0; + if (is_not_internal_pid(caller)) + return 0; + i = LOAD_ATOM(spec, i, am_inet_reply); i = LOAD_PORT(spec, i, desc->dport); i = LOAD_ATOM(spec, i, am_ok); i = LOAD_TUPLE(spec, i, 3); ASSERT(i == sizeof(spec)/sizeof(*spec)); - desc->caller = 0; return erl_drv_send_term(desc->dport, caller, spec, i); } |