Merge branch 'sverk/r16/erl_interface-fixup'

* sverk/r16/erl_interface-fixup:
  erl_interface: Fix ei_skip_term

7 files changed, 103 insertions, 43 deletions

diff --git a/lib/erl_interface/src/decode/decode_fun.c b/lib/erl_interface/src/decode/decode_fun.c
index c4667822e5..2adaedb825 100644
--- a/lib/erl_interface/src/decode/decode_fun.c
+++ b/lib/erl_interface/src/decode/decode_fun.c
@@ -30,6 +30,25 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
     const char *s = buf + *index;
     const char *s0 = s;
     int i, ix, ix0, n;
+    erlang_pid* p_pid;
+    char* p_module;
+    enum erlang_char_encoding* p_module_org_enc;
+    long* p_index;
+    long* p_uniq;
+    long* p_old_index;
+
+    if (p != NULL) {
+	p_pid = &p->pid;
+	p_module = &p->module[0];
+	p_module_org_enc = &p->module_org_enc;
+	p_index = &p->index;
+	p_uniq = &p->uniq;
+	p_old_index = &p->old_index;
+    }
+    else {
+	p_pid = NULL; p_module = NULL; p_module_org_enc = NULL;
+	p_index = NULL; p_uniq = NULL; p_old_index = NULL;
+    }
 
     switch (get8(s)) {
     case ERL_FUN_EXT:
@@ -39,17 +58,17 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 	n = get32be(s);
 	/* then the pid */
 	ix = 0;
-	if (ei_decode_pid(s, &ix, (p == NULL ? (erlang_pid*)NULL : &p->pid)) < 0)
+	if (ei_decode_pid(s, &ix, p_pid) < 0)
 	    return -1;
 	/* then the module (atom) */
-	if (ei_decode_atom_as(s, &ix, (p == NULL ? (char*)NULL : p->module),
-			      MAXATOMLEN_UTF8, ERLANG_UTF8, &p->module_org_enc, NULL) < 0)
+	if (ei_decode_atom_as(s, &ix, p_module, MAXATOMLEN_UTF8, ERLANG_UTF8,
+			      p_module_org_enc, NULL) < 0)
 	    return -1;
 	/* then the index */
-	if (ei_decode_long(s, &ix, (p == NULL ? (long*)NULL : &p->index)) < 0)
+	if (ei_decode_long(s, &ix, p_index) < 0)
 	    return -1;
 	/* then the uniq */
-	if (ei_decode_long(s, &ix, (p == NULL ? (long*)NULL : &p->uniq)) < 0)
+	if (ei_decode_long(s, &ix, p_uniq) < 0)
 	    return -1;
 	/* finally the free vars */
 	ix0 = ix;
@@ -85,17 +104,17 @@ int ei_decode_fun(const char *buf, int *index, erlang_fun *p)
 	if (p != NULL) p->n_free_vars = i;
 	/* then the module (atom) */
 	ix = 0;
-	if (ei_decode_atom_as(s, &ix, (p == NULL ? (char*)NULL : p->module),
-			      MAXATOMLEN_UTF8, ERLANG_UTF8, &p->module_org_enc, NULL) < 0)
+	if (ei_decode_atom_as(s, &ix, p_module, MAXATOMLEN_UTF8, ERLANG_UTF8,
+			      p_module_org_enc, NULL) < 0)
 	    return -1;
 	/* then the old_index */
-	if (ei_decode_long(s, &ix, (p == NULL ? (long*)NULL : &p->old_index)) < 0)
+	if (ei_decode_long(s, &ix, p_old_index) < 0)
 	    return -1;
 	/* then the old_uniq */
-	if (ei_decode_long(s, &ix, (p == NULL ? (long*)NULL : &p->uniq)) < 0)
+	if (ei_decode_long(s, &ix, p_uniq) < 0)
 	    return -1;
 	/* the the pid */
-	if (ei_decode_pid(s, &ix, (p == NULL ? (erlang_pid*)NULL : &p->pid)) < 0)
+	if (ei_decode_pid(s, &ix, p_pid) < 0)
 	    return -1;
 	/* finally the free vars */
 	s += ix;
diff --git a/lib/erl_interface/src/decode/decode_pid.c b/lib/erl_interface/src/decode/decode_pid.c
index 67ce7e05f9..d429fb2fd8 100644
--- a/lib/erl_interface/src/decode/decode_pid.c
+++ b/lib/erl_interface/src/decode/decode_pid.c
@@ -29,16 +29,16 @@ int ei_decode_pid(const char *buf, int *index, erlang_pid *p)
   
   if (get8(s) != ERL_PID_EXT) return -1;
 
-  /* first the nodename */
-  if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
-  
-  /* now the numbers: num (4), serial (4), creation (1) */
   if (p) {
+    if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
     p->num = get32be(s) & 0x7fff; /* 15 bits */
     p->serial = get32be(s) & 0x1fff; /* 13 bits */
     p->creation = get8(s) & 0x03; /* 2 bits */
   }
-  else s+= 9;
+  else {
+      if (get_atom(&s, NULL, NULL) < 0) return -1;
+      s+= 9;
+  }
   
   *index += s-s0;
   
diff --git a/lib/erl_interface/src/decode/decode_port.c b/lib/erl_interface/src/decode/decode_port.c
index 2d1b46e705..7a691f0be6 100644
--- a/lib/erl_interface/src/decode/decode_port.c
+++ b/lib/erl_interface/src/decode/decode_port.c
@@ -28,15 +28,15 @@ int ei_decode_port(const char *buf, int *index, erlang_port *p)
   
   if (get8(s) != ERL_PORT_EXT) return -1;
 
-  /* first the nodename */
-  if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
-  
-  /* now the numbers: num (4), creation (1) */
   if (p) {
+    if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
     p->id = get32be(s) & 0x0fffffff /* 28 bits */;
     p->creation = get8(s) & 0x03;
   }
-  else s += 5;
+  else {
+      if (get_atom(&s, NULL, NULL) < 0) return -1;
+      s += 5;
+  }
   
   *index += s-s0;
   
diff --git a/lib/erl_interface/src/decode/decode_ref.c b/lib/erl_interface/src/decode/decode_ref.c
index 579371ed7d..01e3061cb4 100644
--- a/lib/erl_interface/src/decode/decode_ref.c
+++ b/lib/erl_interface/src/decode/decode_ref.c
@@ -30,17 +30,16 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p)
   
   switch (get8(s)) {
     case ERL_REFERENCE_EXT:
-
-      /* nodename */
-      if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
-  
-      /* now the numbers: num (4), creation (1) */
       if (p) {
+	  if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
 	  p->n[0] = get32be(s);
 	  p->len = 1;
 	  p->creation = get8(s) & 0x03;
       }
-      else s += 5;
+      else {
+	  if (get_atom(&s, NULL, NULL) < 0) return -1;
+	  s += 5;
+      }
   
       *index += s-s0;
   
@@ -50,16 +49,16 @@ int ei_decode_ref(const char *buf, int *index, erlang_ref *p)
     case ERL_NEW_REFERENCE_EXT:
       /* first the integer count */
       count = get16be(s);
-      if (p) p->len = count;
 
-      /* then the nodename */
-      if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
-
-      /* creation */
       if (p) {
+	  p->len = count;
+	  if (get_atom(&s, p->node, &p->node_org_enc) < 0) return -1;
 	  p->creation = get8(s) & 0x03;
       }
-      else s += 1;
+      else {
+	  if (get_atom(&s, NULL, NULL) < 0) return -1;
+	  s += 1;
+      }
 
       /* finally the id integers */
       if (p) {
diff --git a/lib/erl_interface/src/decode/decode_skip.c b/lib/erl_interface/src/decode/decode_skip.c
index f6c5d861ab..e2bfe1f802 100644
--- a/lib/erl_interface/src/decode/decode_skip.c
+++ b/lib/erl_interface/src/decode/decode_skip.c
@@ -30,7 +30,8 @@ int ei_skip_term(const char* buf, int* index)
     switch (ty) {
     case ERL_ATOM_EXT:
 	/* FIXME: what if some weird locale is in use? */
-	if (ei_decode_atom(buf, index, NULL) < 0) return -1;
+	if (ei_decode_atom_as(buf, index, NULL, MAXATOMLEN_UTF8, (ERLANG_LATIN1|ERLANG_UTF8),
+			      NULL, NULL) < 0) return -1;
 	break;
     case ERL_PID_EXT:
 	if (ei_decode_pid(buf, index, NULL) < 0) return -1;
diff --git a/lib/erl_interface/src/decode/decode_trace.c b/lib/erl_interface/src/decode/decode_trace.c
index ebaa78e29e..88fb3451ec 100644
--- a/lib/erl_interface/src/decode/decode_trace.c
+++ b/lib/erl_interface/src/decode/decode_trace.c
@@ -22,18 +22,30 @@
 int ei_decode_trace(const char *buf, int *index, erlang_trace *p)
 {
   int arity = 0;
-  int tindex = *index;
-  
-  /* use a temporary index if any function should fail */
+  int tindex = *index; /* use a temporary index if any function should fail */
+  long *p_flags, *p_label, *p_serial, *p_prev;
+  erlang_pid *p_from;
+
+  if (p != NULL) {
+      p_flags = &p->flags;
+      p_label = &p->label;
+      p_serial = &p->serial;
+      p_prev = &p->prev;
+      p_from = &p->from;
+  }
+  else {
+      p_flags = p_label = p_serial = p_prev = NULL;
+      p_from = NULL;
+  }
 
   /* { Flags, Label, Serial, FromPid, Prev } */
   if (ei_decode_tuple_header(buf, &tindex, &arity)
       || (arity != 5)
-      || ei_decode_long(buf, &tindex, &p->flags)
-      || ei_decode_long(buf, &tindex, &p->label)
-      || ei_decode_long(buf, &tindex, &p->serial)
-      || ei_decode_pid( buf, &tindex, &p->from)
-      || ei_decode_long(buf, &tindex, &p->prev)) return -1;
+      || ei_decode_long(buf, &tindex, p_flags)
+      || ei_decode_long(buf, &tindex, p_label)
+      || ei_decode_long(buf, &tindex, p_serial)
+      || ei_decode_pid( buf, &tindex, p_from)
+      || ei_decode_long(buf, &tindex, p_prev)) return -1;
 
   /* index is updated by the functions we called */
   
diff --git a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
index 996d923ffc..6472cf8db4 100644
--- a/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
+++ b/lib/erl_interface/test/ei_decode_encode_SUITE_data/ei_decode_encode_test.c
@@ -52,7 +52,8 @@ typedef struct
 
 int ei_decode_my_atom(const char *buf, int *index, my_atom* a)
 {
-    return ei_decode_atom_as(buf, index, a->name, sizeof(a->name), ERLANG_UTF8, &a->enc, NULL);
+    return ei_decode_atom_as(buf, index, (a ? a->name : NULL), sizeof(a->name),
+			     ERLANG_UTF8, (a ? &a->enc : NULL), NULL);
 }
 int ei_encode_my_atom(char *buf, int *index, my_atom* a)
 {
@@ -77,7 +78,7 @@ void decode_encode(struct Type* t, void* obj)
     
     MESSAGE("ei_decode_%s, arg is type %s", t->name, t->type);
     buf = read_packet(NULL);
-    err = t->ei_decode_fp(buf+1, &size1, obj);
+    err = t->ei_decode_fp(buf+1, &size1, NULL);
     if (err != 0) {
 	if (err != -1) {
 	    fail("decode returned non zero but not -1");
@@ -96,7 +97,35 @@ void decode_encode(struct Type* t, void* obj)
 	return;
     }
 
+    err = t->ei_decode_fp(buf+1, &size2, obj);
+    if (err != 0) {
+	if (err != -1) {
+	    fail("decode returned non zero but not -1");
+	} else {
+	    fail("decode returned non zero");
+	}
+	return;
+    }
+    if (size1 != size2) {
+	MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
+	fail("decode sizes differs");
+	return;
+    }
+
+    size2 = 0;
+    err = ei_skip_term(buf+1, &size2);
+    if (err != 0) {
+	fail("ei_skip_term returned non zero");
+	return;
+    }
+    if (size1 != size2) {
+	MESSAGE("size1 = %d, size2 = %d\n",size1,size2);
+	fail("skip size differs");
+	return;
+    }
+
     MESSAGE("ei_encode_%s buf is NULL, arg is type %s", t->name, t->type);
+    size2 = 0;
     err = t->ei_encode_fp(NULL, &size2, obj);
     if (err != 0) {
 	if (err != -1) {