1 files changed, 24 insertions, 29 deletions

diff --git a/lib/erl_interface/src/decode/decode_pid.c b/lib/erl_interface/src/decode/decode_pid.c
index 9ed1c36db6..e1055aa5c9 100644
--- a/lib/erl_interface/src/decode/decode_pid.c
+++ b/lib/erl_interface/src/decode/decode_pid.c
@@ -1,18 +1,19 @@
 /*
  * %CopyrightBegin%
  * 
- * Copyright Ericsson AB 1998-2011. 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%
  */
@@ -21,34 +22,28 @@
 #include "eiext.h"
 #include "putget.h"
 
+
 int ei_decode_pid(const char *buf, int *index, erlang_pid *p)
 {
   const char *s = buf + *index;
   const char *s0 = s;
-  int len;
+  const char tag = get8(s);
   
-  if (get8(s) != ERL_PID_EXT) return -1;
-
-  /* first the nodename */
-  if (get8(s) != ERL_ATOM_EXT) return -1;
+  if (tag != ERL_PID_EXT && tag != ERL_NEW_PID_EXT) return -1;
 
-  len = get16be(s);
-
-  if (len > MAXATOMLEN) return -1;
-  
-  if (p) {
-    memmove(p->node, s, len);
-    p->node[len] = (char)0;
-  }
-  s += len;
-  
-  /* now the numbers: num (4), serial (4), creation (1) */
   if (p) {
+    if (get_atom(&s, p->node, NULL) < 0) return -1;
     p->num = get32be(s) & 0x7fff; /* 15 bits */
     p->serial = get32be(s) & 0x1fff; /* 13 bits */
-    p->creation = get8(s) & 0x03; /* 2 bits */
+    if (tag == ERL_PID_EXT)
+        p->creation = get8(s) & 0x03; /* 2 bits */
+    else
+        p->creation = get32be(s); /* 32 bits */
+  }
+  else {
+      if (get_atom(&s, NULL, NULL) < 0) return -1;
+      s+= (tag == ERL_PID_EXT ? 9 : 12);
   }
-  else s+= 9;
   
   *index += s-s0;