diff options
author | Erlang/OTP <[email protected]> | 2019-07-11 17:18:50 +0200 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2019-07-11 17:18:50 +0200 |
commit | efddea245dae866b80c98a069cdeb4266d5ee4ab (patch) | |
tree | fad24aa207bb89ae08aa21de1da27e20d97e3769 /lib/ssl/src/tls_record.erl | |
parent | 1be06fca56f5a13894b5317292fb3077d99e27d5 (diff) | |
parent | 7db6faacd845ced366bbd98aef1ce85856781e53 (diff) | |
download | otp-efddea245dae866b80c98a069cdeb4266d5ee4ab.tar.gz otp-efddea245dae866b80c98a069cdeb4266d5ee4ab.tar.bz2 otp-efddea245dae866b80c98a069cdeb4266d5ee4ab.zip |
Merge branch 'raimo/ssl/fix-zero-fragment-buffer-handling/ERIERL-379/OTP-15328' into maint-21
* raimo/ssl/fix-zero-fragment-buffer-handling/ERIERL-379/OTP-15328:
Do not call dist_ctrl_put_data with empty binaries
Refine the queue code
Fix extracting 0 bytes from queue
Diffstat (limited to 'lib/ssl/src/tls_record.erl')
-rw-r--r-- | lib/ssl/src/tls_record.erl | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/ssl/src/tls_record.erl b/lib/ssl/src/tls_record.erl index 38022030ee..20598ea702 100644 --- a/lib/ssl/src/tls_record.erl +++ b/lib/ssl/src/tls_record.erl @@ -489,16 +489,27 @@ validate_tls_record_length(Versions, {_,Size0,_} = Q0, Acc, Type, Version, Lengt end. -binary_from_front(SplitSize, {Front,Size,Rear}) -> +binary_from_front(0, Q) -> + {<<>>, Q}; +binary_from_front(SplitSize, {Front,Size,Rear}) when SplitSize =< Size -> binary_from_front(SplitSize, Front, Size, Rear, []). %% -binary_from_front(SplitSize, [], Size, [_] = Rear, Acc) -> - %% Optimize a simple case - binary_from_front(SplitSize, Rear, Size, [], Acc); +%% SplitSize > 0 and there is at least SplitSize bytes buffered in Front and Rear binary_from_front(SplitSize, [], Size, Rear, Acc) -> - binary_from_front(SplitSize, lists:reverse(Rear), Size, [], Acc); + case Rear of + %% Avoid lists:reverse/1 for simple cases. + %% Case clause for [] to avoid infinite loop. + [_] -> + binary_from_front(SplitSize, Rear, Size, [], Acc); + [Bin2,Bin1] -> + binary_from_front(SplitSize, [Bin1,Bin2], Size, [], Acc); + [Bin3,Bin2,Bin1] -> + binary_from_front(SplitSize, [Bin1,Bin2,Bin3], Size, [], Acc); + [_,_,_|_] -> + binary_from_front(SplitSize, lists:reverse(Rear), Size, [], Acc) + end; binary_from_front(SplitSize, [Bin|Front], Size, Rear, []) -> - %% Optimize a frequent case + %% Optimize the frequent case when the accumulator is empty BinSize = byte_size(Bin), if SplitSize < BinSize -> |