aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-08-13 12:34:03 +0200
committerErlang/OTP <[email protected]>2015-08-13 12:34:03 +0200
commit0c21fb612b736f53dcc04face42bd106c50287ae (patch)
tree775ce0b96e36514a93007ba1172b0aaca97eaff1 /lib/diameter/src/base
parente67e20613e17739b084d7f10e1feb7ca11a92708 (diff)
parent7f4f9583bb1245c27ca58d88fe6862498a2df1f2 (diff)
downloadotp-0c21fb612b736f53dcc04face42bd106c50287ae.tar.gz
otp-0c21fb612b736f53dcc04face42bd106c50287ae.tar.bz2
otp-0c21fb612b736f53dcc04face42bd106c50287ae.zip
Merge branch 'anders/diameter/grouped_errors/OTP-12930' into maint-17
* anders/diameter/grouped_errors/OTP-12930: Fix decode of Grouped AVPs containing errors Simplify logic Simplify logic
Diffstat (limited to 'lib/diameter/src/base')
-rw-r--r--lib/diameter/src/base/diameter_codec.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index 2ad971a422..f900bb0c5e 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -590,6 +590,7 @@ split_head(<<Code:32, 0:1, M:1, P:1, _:5, Len:24, _/binary>>) ->
%% Header is truncated.
split_head(Bin) ->
?THROW({5014, #diameter_avp{data = Bin}}).
+%% Note that pack_avp/1 will pad this at encode if sent in a Failed-AVP.
%% 3588:
%%
@@ -619,7 +620,7 @@ split_head(Bin) ->
%% AVP header with zero up to the minimum AVP header length.
%%
%% The underlined clause must be in error since (1) a header less than
-%% the minimum value mean we don't know the identity of the AVP and
+%% the minimum value mean we might not know the identity of the AVP and
%% (2) the last sentence covers this case.
%% split_data/3