File 0717-LCNT-fix-port-parser-for-V4_PORT_EXT.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0717-LCNT-fix-port-parser-for-V4_PORT_EXT.patch of Package erlang (Revision eecee6bca81667ccdc168e9e715f9a9a)

Currently displaying revision eecee6bca81667ccdc168e9e715f9a9a , Show latest

From 26bcdbc702e055c1381776d52d5874bc6c936aa2 Mon Sep 17 00:00:00 2001
From: Danil Zagoskin <z@gosk.in>
Date: Fri, 21 Apr 2023 17:56:38 +0300
Subject: [PATCH] LCNT: fix port parser for V4_PORT_EXT

After commit e6074fada29f7ec8a8ffd28e6a3aab75f74199f5,
term_to_binary always uses V4_PORT_EXT for port encoding.
That led to lcnt crashes in clean_id_creation/1 function.

This commit makes lcnt aware of V4_PORT_EXT syntax.
---
 lib/tools/src/lcnt.erl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/tools/src/lcnt.erl b/lib/tools/src/lcnt.erl
index 978c78038d..8661df696d 100644
--- a/lib/tools/src/lcnt.erl
+++ b/lib/tools/src/lcnt.erl
@@ -893,7 +893,7 @@ clean_id_creation(Id) when is_port(Id) ->
     <<131, PortTag, AtomTag>> = H,
     LL = atomlen_bits(AtomTag),
     CL = creation_bits(PortTag),
-    <<L:LL, Node:L/binary, Ids:4/binary, _Creation/binary>> = Rest,
+    <<L:LL, Node:L/binary, Ids:8/binary, _Creation/binary>> = Rest,
     Bin2 = list_to_binary([H, <<L:LL>>, Node, Ids, <<0:CL>>]),
     binary_to_term(Bin2);
 clean_id_creation(Id) ->
@@ -901,8 +901,7 @@ clean_id_creation(Id) ->
 
 -define(PID_EXT, $g).
 -define(NEW_PID_EXT, $X).
--define(PORT_EXT, $f).
--define(NEW_PORT_EXT, $Y).
+-define(V4_PORT_EXT, $x).
 -define(ATOM_EXT, $d).
 -define(SMALL_ATOM_EXT, $s).
 -define(ATOM_UTF8_EXT, $v).
@@ -915,8 +914,7 @@ atomlen_bits(?SMALL_ATOM_UTF8_EXT) -> 8.
 
 creation_bits(?PID_EXT) -> 8;
 creation_bits(?NEW_PID_EXT) -> 32;
-creation_bits(?PORT_EXT) -> 8;
-creation_bits(?NEW_PORT_EXT) -> 32.
+creation_bits(?V4_PORT_EXT) -> 32.
 
 %% serializer
 
-- 
2.35.3

Places

File 0717-LCNT-fix-port-parser-for-V4_PORT_EXT.patch of Package erlang (Revision eecee6bca81667ccdc168e9e715f9a9a)

Places