diff options
author | Sverker Eriksson <[email protected]> | 2013-02-08 16:21:07 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2013-02-08 16:21:07 +0100 |
commit | 7d1060c624676c5dde532d1cb59fa177329f4178 (patch) | |
tree | f7595f06dfb9553b11faf2656aefc175f6915178 /lib/erl_interface/src/decode/decode_port.c | |
parent | 9a476f1c86845c4bd15ed849f07fc788b593e2fa (diff) | |
parent | f822540687d16eecfcd2d74b55091593c674d478 (diff) | |
download | otp-7d1060c624676c5dde532d1cb59fa177329f4178.tar.gz otp-7d1060c624676c5dde532d1cb59fa177329f4178.tar.bz2 otp-7d1060c624676c5dde532d1cb59fa177329f4178.zip |
Merge branch 'sverk/r16/erl_interface-fixup'
* sverk/r16/erl_interface-fixup:
erl_interface: Fix ei_skip_term
Diffstat (limited to 'lib/erl_interface/src/decode/decode_port.c')
-rw-r--r-- | lib/erl_interface/src/decode/decode_port.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/erl_interface/src/decode/decode_port.c b/lib/erl_interface/src/decode/decode_port.c index 2d1b46e705..7a691f0be6 100644 --- a/lib/erl_interface/src/decode/decode_port.c +++ b/lib/erl_interface/src/decode/decode_port.c @@ -28,15 +28,15 @@ int ei_decode_port(const char *buf, int *index, erlang_port *p) if (get8(s) != ERL_PORT_EXT) return -1; - /* first the nodename */ - if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1; - - /* now the numbers: num (4), creation (1) */ if (p) { + if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1; p->id = get32be(s) & 0x0fffffff /* 28 bits */; p->creation = get8(s) & 0x03; } - else s += 5; + else { + if (get_atom(&s, NULL, NULL) < 0) return -1; + s += 5; + } *index += s-s0; |