File 0666-snmp-replace-size-by-xxx_size.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0666-snmp-replace-size-by-xxx_size.patch of Package erlang (Revision 3960e820eabd23c72bd43033ebfdf3ef)

Currently displaying revision 3960e820eabd23c72bd43033ebfdf3ef , Show latest

From ccb87145accc45f5177708b664e160fdef256425 Mon Sep 17 00:00:00 2001
From: Kiko Fernandez-Reyes <kiko@erlang.org>
Date: Tue, 7 Feb 2023 09:47:41 +0100
Subject: [PATCH] snmp: replace size by xxx_size

The <c>size/1</c> BIF is not optimized by the JIT, and its use can
result in worse types for Dialyzer.

When one knows that the value being tested must be a tuple,
<c>tuple_size/1</c> should always be preferred.

When one knows that the value being tested must be a binary,
<c>byte_size/1</c> should be preferred. However, <c>byte_size/1</c> also
accepts a bitstring (rounding up size to a whole number of bytes), so
one must make sure that the call to <c>byte_size/</c> is preceded by a
call to <c>is_binary/1</c> to ensure that bitstrings are rejected. Note
that the compiler removes redundant calls to <c>is_binary/1</c>, so if
one is not sure whether previous code had made sure that the argument is
a binary, it does not harm to add an <c>is_binary/1</c> test immediately
before the call to <c>byte_size/1</c>.
---
 lib/snmp/src/manager/snmpm_mpd.erl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/snmp/src/manager/snmpm_mpd.erl b/lib/snmp/src/manager/snmpm_mpd.erl
index 77e93cd0a3..32a4c23767 100644
--- a/lib/snmp/src/manager/snmpm_mpd.erl
+++ b/lib/snmp/src/manager/snmpm_mpd.erl
@@ -324,7 +324,7 @@ process_v3_msg(NoteStore, Msg, Hdr, Data, Address, Log) ->
 			     CtxEngineID, CtxName, PDU#pdu.request_id}, 
 		    Err   = sec_error(Note, Recv), 
  		    ACM   = {invalid_sec_info, Err}, 
-		    ReqId = element(size(Note), Note), 
+		    ReqId = element(tuple_size(Note), Note),
  		    {ok, 'version-3', PDU, PduMMS, {error, ReqId, ACM}};
 		_NoFound ->
 		    ?vtrace("process_v3_msg -> _NoFound: "
@@ -412,10 +412,10 @@ process_v3_msg(NoteStore, Msg, Hdr, Data, Address, Log) ->
 
 
 sec_error(T1, T2) 
-  when is_tuple(T1) andalso is_tuple(T2) andalso (size(T1) =:= size(T2)) ->
+  when tuple_size(T1) =:= tuple_size(T2) ->
     Tags = {sec_engine_id, msg_sec_model, sec_name, sec_level, 
 	    ctx_engine_id, ctx_name, request_id}, 
-    sec_error(size(T1), T1, T2, Tags, []);
+    sec_error(tuple_size(T1), T1, T2, Tags, []);
 sec_error(T1, T2) ->
     [{internal_error, T1, T2}].
 
@@ -622,7 +622,7 @@ generate_v1_v2c_msg(Vsn, Pdu, Community, Log) ->
 			     "(pdu: ~w, community: ~w): ~n~w",
 			     [Pdu, Community, Reason]),
 		    {discarded, Reason};
-		{ok, Packet} when size(Packet) =< MMS ->
+		{ok, Packet} when byte_size(Packet) =< MMS ->
 		    Log(Packet),
 		    inc_snmp_out(Pdu),
 		    {ok, Packet};
@@ -630,7 +630,7 @@ generate_v1_v2c_msg(Vsn, Pdu, Community, Log) ->
 		    ?vlog("packet max size exceeded: "
 			  "~n   MMS: ~p"
 			  "~n   Len: ~p",
-			  [MMS, size(Packet)]),
+			  [MMS, byte_size(Packet)]),
 		    {discarded, tooBig}
 	    end
     end.
@@ -683,7 +683,7 @@ generate_v3_response_msg(#pdu{type = Type} = Pdu, MsgID,
 		%% if it's larger than the agent can handle - 
 		%% it will be dropped. Just check against the
 		%% internal size.  
-		{ok, Packet} when size(Packet) =< MMS ->
+		{ok, Packet} when byte_size(Packet) =< MMS ->
 		    if
 			SecLevel == 3 -> 
 			    %% encrypted - log decrypted pdu
@@ -760,13 +760,13 @@ generate_v1_v2c_response_msg(Vsn, Pdu, Comm, Log) ->
 			     [Pdu, Comm, Reason]),
 		    {discarded, Reason};
 		
-		{ok, Packet} when size(Packet) =< MMS ->
+		{ok, Packet} when byte_size(Packet) =< MMS ->
 		    Log(Packet),
 		    inc_snmp_out(Pdu),
 		    {ok, Packet};
 
 		{ok, Packet} ->  %% Too big
-		    too_big(Vsn, Pdu, Comm, MMS, size(Packet), Log)
+		    too_big(Vsn, Pdu, Comm, MMS, byte_size(Packet), Log)
 	    end
     end.
 		    
-- 
2.35.3

Places

File 0666-snmp-replace-size-by-xxx_size.patch of Package erlang (Revision 3960e820eabd23c72bd43033ebfdf3ef)

Places