diff options
author | Sverker Eriksson <[email protected]> | 2016-04-12 18:54:23 +0200 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2016-04-12 18:54:23 +0200 |
commit | 0f8f4e96ff8479018e5e921775654adc15f5e771 (patch) | |
tree | 33554de3cf013e6df61977bb5af4cd409197583f /lib/erl_interface/src/decode/decode_port.c | |
parent | 5b31b2196bbb13ba650207f4ef94b2e1fa8f6121 (diff) | |
parent | e4b8b9be39601b1c79dfd5d8e807ae4c404b6935 (diff) | |
download | otp-0f8f4e96ff8479018e5e921775654adc15f5e771.tar.gz otp-0f8f4e96ff8479018e5e921775654adc15f5e771.tar.bz2 otp-0f8f4e96ff8479018e5e921775654adc15f5e771.zip |
Merge branch 'sverk/big-external-creations.OTP-13488'
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, 7 insertions, 3 deletions
diff --git a/lib/erl_interface/src/decode/decode_port.c b/lib/erl_interface/src/decode/decode_port.c index e039b5b845..7b61f254ff 100644 --- a/lib/erl_interface/src/decode/decode_port.c +++ b/lib/erl_interface/src/decode/decode_port.c @@ -26,17 +26,21 @@ int ei_decode_port(const char *buf, int *index, erlang_port *p) { const char *s = buf + *index; const char *s0 = s; + const char tag = get8(s); - if (get8(s) != ERL_PORT_EXT) return -1; + if (tag != ERL_PORT_EXT && tag != ERL_NEW_PORT_EXT) return -1; if (p) { if (get_atom(&s, p->node, NULL) < 0) return -1; p->id = get32be(s) & 0x0fffffff /* 28 bits */; - p->creation = get8(s) & 0x03; + if (tag == ERL_PORT_EXT) + p->creation = get8(s) & 0x03; + else + p->creation = get32be(s); } else { if (get_atom(&s, NULL, NULL) < 0) return -1; - s += 5; + s += (tag == ERL_PORT_EXT ? 5 : 8); } *index += s-s0; |