3 files changed, 65 insertions, 17 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:
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:
diff --git a/lib/erl_interface/src/misc/ei_printterm.c b/lib/erl_interface/src/misc/ei_printterm.c
index 5c40fb7747..aee7f7eeb0 100644
--- a/lib/erl_interface/src/misc/ei_printterm.c
+++ b/lib/erl_interface/src/misc/ei_printterm.c
@@ -121,8 +121,10 @@ static int print_term(FILE* fp, ei_x_buff* x,
     erlang_pid pid;
     erlang_port port;
     erlang_ref ref;
+    erlang_fun fun;
     double d;
     long l;
+    const char* delim;
 
     int tindex = *index;
 
@@ -239,41 +241,47 @@ static int print_term(FILE* fp, ei_x_buff* x,
 	    m = BINPRINTSIZE;
 	else
 	    m = l;
-	--m;
+        delim = "";
 	for (i = 0; i < m; ++i) {
-	    ch_written += xprintf(fp, x, "%d,", p[i]);
+	    ch_written += xprintf(fp, x, "%s%u", delim, (unsigned char)p[i]);
+            delim = ",";
 	}
-	ch_written += xprintf(fp, x, "%d", p[i]);
 	if (l > BINPRINTSIZE)
 	    ch_written += xprintf(fp, x, ",...");
 	xputc('>', fp, x); ++ch_written;
 	ei_free(p);
 	break;
     case ERL_BIT_BINARY_EXT: {
-        const char* cp;
+        const unsigned char* cp;
         size_t bits;
         unsigned int bitoffs;
         int trunc = 0;
 
-        if (ei_decode_bitstring(buf, index, &cp, &bitoffs, &bits) < 0
+        if (ei_decode_bitstring(buf, index, (const char**)&cp, &bitoffs, &bits) < 0
             || bitoffs != 0) {
             goto err;
         }
         ch_written += xprintf(fp, x, "#Bits<");
-        m = (bits+7) / 8;
-        if (m > BINPRINTSIZE) {
+        if ((bits+7) / 8 > BINPRINTSIZE) {
             m = BINPRINTSIZE;
             trunc = 1;
         }
-        --m;
+        else
+            m = bits / 8;
+
+        delim = "";
         for (i = 0; i < m; ++i) {
-            ch_written += xprintf(fp, x, "%d,", cp[i]);
+            ch_written += xprintf(fp, x, "%s%u", delim, cp[i]);
+            delim = ",";
         }
-        ch_written += xprintf(fp, x, "%d", cp[i]);
         if (trunc)
             ch_written += xprintf(fp, x, ",...");
-        else if (bits % 8 != 0)
-            ch_written += xprintf(fp, x, ":%u", (unsigned)(bits % 8));
+        else {
+            bits %= 8;
+            if (bits)
+                ch_written += xprintf(fp, x, "%s%u:%u", delim,
+                                      (cp[i] >> (8-bits)), bits);
+        }
         xputc('>', fp, x); ++ch_written;
         break;
     }
@@ -306,12 +314,46 @@ static int print_term(FILE* fp, ei_x_buff* x,
             
         }
         break;
-
     case ERL_FLOAT_EXT:
     case NEW_FLOAT_EXT:
 	if (ei_decode_double(buf, index, &d) < 0) goto err;
 	ch_written += xprintf(fp, x, "%f", d);
 	break;
+    case ERL_MAP_EXT:
+	if (ei_decode_map_header(buf, &tindex, &n) < 0) goto err;
+        ch_written += xprintf(fp, x, "#{");
+	for (i = 0; i < n; ++i) {
+	    r = print_term(fp, x, buf, &tindex);
+	    if (r < 0) goto err;
+	    ch_written += r;
+            ch_written += xprintf(fp, x, " => ");
+	    r = print_term(fp, x, buf, &tindex);
+	    if (r < 0) goto err;
+	    ch_written += r;
+	    if (i < n-1) {
+		xputs(", ", fp, x); ch_written += 2;
+	    }
+	}
+	*index = tindex;
+	xputc('}', fp, x); ch_written++;
+	break;
+    case ERL_FUN_EXT:
+    case ERL_NEW_FUN_EXT:
+    case ERL_EXPORT_EXT:
+	if (ei_decode_fun(buf, &tindex, &fun) < 0) goto err;
+        if (fun.type == EI_FUN_EXPORT) {
+            ch_written += xprintf(fp, x, "fun %s:%s/%ld",
+                                  fun.module,
+                                  fun.u.exprt.func,
+                                  fun.arity);
+        } else {
+            ch_written += xprintf(fp, x, "#Fun{%s.%ld.%lu}",
+                                  fun.module,
+                                  fun.u.closure.index,
+                                  fun.u.closure.uniq);
+        }
+	*index = tindex;
+	break;
     default:
 	goto err;
     }