diff options
| author | Sverker Eriksson <[email protected]> | 2015-11-13 16:50:33 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-04-07 18:41:47 +0200 |
| commit | 9c80b9ec06fc0ca89dcc8d797a2dbc408a162098 (patch) | |
| tree | 00920702806a31febc140ebca3850622a93836ff /lib/erl_interface/src/decode/decode_ref.c | |
| parent | bf0bf9cf009fa8ccc7fc364fdbbdeb6f491efe43 (diff) | |
| download | otp-9c80b9ec06fc0ca89dcc8d797a2dbc408a162098.tar.gz otp-9c80b9ec06fc0ca89dcc8d797a2dbc408a162098.tar.bz2 otp-9c80b9ec06fc0ca89dcc8d797a2dbc408a162098.zip | |
erl_interface: Support 32-bit creation for pid,port,refs
Diffstat (limited to 'lib/erl_interface/src/decode/decode_ref.c')
| -rw-r--r-- | lib/erl_interface/src/decode/decode_ref.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/lib/erl_interface/src/decode/decode_ref.c b/lib/erl_interface/src/decode/decode_ref.c index a6b87e5a21..b8e1ebfedd 100644 --- a/lib/erl_interface/src/decode/decode_ref.c +++ b/lib/erl_interface/src/decode/decode_ref.c @@ -28,8 +28,9 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p) const char *s = buf + *index; const char *s0 = s; int count, i; + const char tag = get8(s); - switch (get8(s)) { + switch (tag) { case ERL_REFERENCE_EXT: if (p) { if (get_atom(&s, p->node, NULL) < 0) return -1; @@ -47,18 +48,23 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p) return 0; break; - case ERL_NEW_REFERENCE_EXT: + case ERL_NEW_REFERENCE_EXT: + case ERL_NEWER_REFERENCE_EXT: + /* first the integer count */ count = get16be(s); if (p) { p->len = count; if (get_atom(&s, p->node, NULL) < 0) return -1; - p->creation = get8(s) & 0x03; + if (tag == ERL_NEW_REFERENCE_EXT) + p->creation = get8(s) & 0x03; + else + p->creation = get32be(s); } else { if (get_atom(&s, NULL, NULL) < 0) return -1; - s += 1; + s += (tag == ERL_NEW_REFERENCE_EXT ? 1 : 4); } /* finally the id integers */ |