diff options
| author | Björn Gustavsson <[email protected]> | 2019-05-21 10:43:56 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2019-05-21 12:25:50 +0200 |
| commit | da08da374cfa652374ddb46846550cc83798c2ab (patch) | |
| tree | fa87277d115aeed9bdc6ec51936e88a42ad78f9b /lib/erl_interface/src | |
| parent | b928e601fcff6df38d7c914050f21db3f85f2d83 (diff) | |
| download | otp-da08da374cfa652374ddb46846550cc83798c2ab.tar.gz otp-da08da374cfa652374ddb46846550cc83798c2ab.tar.bz2 otp-da08da374cfa652374ddb46846550cc83798c2ab.zip | |
Correct decoding of external funs
Diffstat (limited to 'lib/erl_interface/src')
| -rw-r--r-- | lib/erl_interface/src/decode/decode_fun.c | 3 | ||||
| -rw-r--r-- | lib/erl_interface/src/decode/decode_skip.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/erl_interface/src/decode/decode_fun.c b/lib/erl_interface/src/decode/decode_fun.c index 3a7a2b01c1..70e76e956c 100644 --- a/lib/erl_interface/src/decode/decode_fun.c +++ b/lib/erl_interface/src/decode/decode_fun.c @@ -146,6 +146,7 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p) else { p_arity = NULL; } + ix = 0; if (ei_decode_atom_as(s, &ix, p_module, MAXATOMLEN_UTF8, ERLANG_UTF8, NULL, NULL) < 0) return -1; @@ -171,6 +172,8 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p) } if (ei_decode_long(s, &ix, p_arity) < 0) return -1; + s += ix; + *index += s - s0; return 0; } default: diff --git a/lib/erl_interface/src/decode/decode_skip.c b/lib/erl_interface/src/decode/decode_skip.c index 736c00e074..0622ce7d59 100644 --- a/lib/erl_interface/src/decode/decode_skip.c +++ b/lib/erl_interface/src/decode/decode_skip.c @@ -97,6 +97,7 @@ int ei_skip_term(const char* buf, int* index) break; case ERL_FUN_EXT: case ERL_NEW_FUN_EXT: + case ERL_EXPORT_EXT: if (ei_decode_fun(buf, index, NULL) < 0) return -1; break; default: |