File 0656-ftp-replace-size-1-by-XXX_size-1.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0656-ftp-replace-size-1-by-XXX_size-1.patch of Package erlang (Revision 1c1ec2286ec8c6850495fea034df4e6c)

Currently displaying revision 1c1ec2286ec8c6850495fea034df4e6c , Show latest

From e57f0ae87eb4de8f09ec05bc8060ffdbf508fc2b Mon Sep 17 00:00:00 2001
From: Kiko Fernandez-Reyes <kiko@erlang.org>
Date: Wed, 1 Feb 2023 15:14:15 +0100
Subject: [PATCH 1/2] ftp: replace size/1 by XXX_size/1

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/ftp/src/ftp.erl          | 10 +++++-----
 lib/ftp/src/ftp_response.erl |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/ftp/src/ftp.erl b/lib/ftp/src/ftp.erl
index 3bbafac127..5ed87c937c 100644
--- a/lib/ftp/src/ftp.erl
+++ b/lib/ftp/src/ftp.erl
@@ -2338,8 +2338,8 @@ file_close(Fd) ->
 
 file_read(Fd) ->
     case file:read(Fd, ?FILE_BUFSIZE) of
-        {ok, Bytes} ->
-            {ok, size(Bytes), Bytes};
+        {ok, Bytes} when is_binary(Bytes) ->
+            {ok, byte_size(Bytes), Bytes};
         eof ->
             {ok, 0, []};
         Other ->
@@ -2426,8 +2426,8 @@ progress_report(_, #state{progress = ignore}) ->
     ok;
 progress_report(stop, #state{progress = ProgressPid}) ->
     ftp_progress:stop(ProgressPid);
-progress_report({binary, Data}, #state{progress = ProgressPid}) ->
-    ftp_progress:report(ProgressPid, {transfer_size, size(Data)});
+progress_report({binary, Data}, #state{progress = ProgressPid}) when is_binary(Data) ->
+    ftp_progress:report(ProgressPid, {transfer_size, byte_size(Data)});
 progress_report(Report, #state{progress = ProgressPid}) ->
     ftp_progress:report(ProgressPid, Report).
 
@@ -2519,7 +2519,7 @@ open_options(Options) ->
         fun(Host) when is_list(Host) ->
                 true;
            (Host) when is_tuple(Host) andalso
-                       ((size(Host) =:= 4) orelse (size(Host) =:= 8)) ->
+                       ((tuple_size(Host) =:= 4) orelse (tuple_size(Host) =:= 8)) ->
                 true;
            (_) ->
                 false
diff --git a/lib/ftp/src/ftp_response.erl b/lib/ftp/src/ftp_response.erl
index 1fbbf9f044..42badff9b4 100644
--- a/lib/ftp/src/ftp_response.erl
+++ b/lib/ftp/src/ftp_response.erl
@@ -80,7 +80,7 @@
 %% Make sure we received the first 4 bytes so we know how to parse
 %% the FTP server response e.i. is the response composed of one
 %% or multiple lines.
-parse_lines(Bin, Lines, start) when size(Bin) < 4 ->
+parse_lines(Bin, Lines, start) when is_binary(Bin), byte_size(Bin) < 4 ->
     {continue, {Bin, Lines, start}};
 %% Multiple lines exist
 parse_lines(<<C1, C2, C3, $-, Rest/binary>>, Lines, start) ->
-- 
2.35.3

Places

File 0656-ftp-replace-size-1-by-XXX_size-1.patch of Package erlang (Revision 1c1ec2286ec8c6850495fea034df4e6c)

Places