diff options
| author | Björn Gustavsson <[email protected]> | 2019-06-03 11:28:59 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-06-03 11:28:59 +0200 |
| commit | fbee646c4ff63327512f25eb07be0ede66e55599 (patch) | |
| tree | 2e077ed99baf611adf6d52c6a6b1d0aab26356ce /lib/erl_interface/src/decode/decode_fun.c | |
| parent | 6e3ce6cac718ff0eae1349eb0b4ab8513abba343 (diff) | |
| parent | 5fef9df3faf0504c5c281a5720b992c19c94a6c2 (diff) | |
| download | otp-fbee646c4ff63327512f25eb07be0ede66e55599.tar.gz otp-fbee646c4ff63327512f25eb07be0ede66e55599.tar.bz2 otp-fbee646c4ff63327512f25eb07be0ede66e55599.zip | |
Merge pull request #2246 from bjorng/bjorn/erl_interface/term-printing/OTP-15814
Support printing of maps and funs in ei_print_term()
Diffstat (limited to 'lib/erl_interface/src/decode/decode_fun.c')
| -rw-r--r-- | lib/erl_interface/src/decode/decode_fun.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/erl_interface/src/decode/decode_fun.c b/lib/erl_interface/src/decode/decode_fun.c index 3a7a2b01c1..db71007505 100644 --- a/lib/erl_interface/src/decode/decode_fun.c +++ b/lib/erl_interface/src/decode/decode_fun.c @@ -77,10 +77,12 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p) } if (p != NULL) { p->u.closure.n_free_vars = n; - p->u.closure.free_var_len = ix - ix0; - p->u.closure.free_vars = ei_malloc(ix - ix0); - if (!(p->u.closure.free_vars)) return -1; - memcpy(p->u.closure.free_vars, s + ix0, ix - ix0); + p->u.closure.free_var_len = ix - ix0; + if (p->u.closure.free_var_len > 0) { + p->u.closure.free_vars = ei_malloc(p->u.closure.free_var_len); + if (!(p->u.closure.free_vars)) return -1; + memcpy(p->u.closure.free_vars, s + ix0, p->u.closure.free_var_len); + } } s += ix; *index += s-s0; @@ -146,6 +148,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 +174,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: |