1 files changed, 29 insertions, 28 deletions

diff --git a/lib/erl_interface/src/encode/encode_pid.c b/lib/erl_interface/src/encode/encode_pid.c
index ee7f235c17..d14746b40f 100644
--- a/lib/erl_interface/src/encode/encode_pid.c
+++ b/lib/erl_interface/src/encode/encode_pid.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2009. All Rights Reserved.
+ * Copyright Ericsson AB 1998-2016. All Rights Reserved.
  * 
- * The contents of this file are subject to the Erlang Public License,
- * Version 1.1, (the "License"); you may not use this file except in
- * compliance with the License. You should have received a copy of the
- * Erlang Public License along with this software. If not, it can be
- * retrieved online at http://www.erlang.org/.
- * 
- * Software distributed under the License is distributed on an "AS IS"
- * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- * the License for the specific language governing rights and limitations
- * under the License.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  * 
  * %CopyrightEnd%
  */
@@ -23,30 +24,30 @@
 
 int ei_encode_pid(char *buf, int *index, const erlang_pid *p)
 {
-  char *s = buf + *index;
-  char *s0 = s;
-  int len = strlen(p->node);
-  
-  if (!buf) s += 13 + len;
-  else {
-    put8(s,ERL_PID_EXT);
+  char* s = buf + *index;
+  const char tag = (p->creation > 3) ? ERL_NEW_PID_EXT : ERL_PID_EXT;
+
+  ++(*index); /* skip ERL_PID_EXT */
+  if (ei_encode_atom_len_as(buf, index, p->node, strlen(p->node),
+			    ERLANG_UTF8, ERLANG_LATIN1|ERLANG_UTF8) < 0)
+      return -1;
 
-    /* first the nodename */
-    put8(s,ERL_ATOM_EXT);
+  if (buf) {
+    put8(s, tag);
 
-    put16be(s,len);
-  
-    memmove(s, p->node, len);
-    s += len;
+    s = buf + *index;
 
     /* now the integers */
     put32be(s,p->num & 0x7fff); /* 15 bits */
     put32be(s,p->serial & 0x1fff); /* 13 bits */
-    put8(s,(p->creation & 0x03)); /* 2 bits */
+    if (tag == ERL_PID_EXT) {
+        put8(s,(p->creation & 0x03)); /* 2 bits */
+    } else {
+        put32be(s, p->creation); /* 32 bits */
+    }
   }
-  
-  *index += s-s0;
-  
+
+  *index += 4 + 4 + (tag == ERL_PID_EXT ? 1 : 4);
   return 0;
 }