Merge branch 'anders/diameter/grouped_decode/OTP-12475' into maint

* anders/diameter/grouped_decode/OTP-12475:
  Allow encode of decoded diameter_avp list
  Add testcases for diameter_avp decode
  Fix handling of length errors on Grouped AVPs
  Don't discard component diameter_avp list on Grouped AVP decode error
  Fix process dictionary manipulation during message decode

1 files changed, 10 insertions, 8 deletions

diff --git a/lib/diameter/src/base/diameter_codec.erl b/lib/diameter/src/base/diameter_codec.erl
index f9bc44cf61..b4ecb63961 100644
--- a/lib/diameter/src/base/diameter_codec.erl
+++ b/lib/diameter/src/base/diameter_codec.erl
@@ -564,14 +564,14 @@ split_data(Bin, Len) ->
         <<Data:Len/binary, _:Pad/binary, Rest/binary>> ->
             {Data, Rest};
         _ ->
-            %% Header length points past the end of the message. As
-            %% stated in the 6733 text above, it's sufficient to
-            %% return a zero-filled minimal payload if this is a
-            %% request. Do this (in cases that we know the type) by
-            %% inducing a decode failure and letting the dictionary's
-            %% decode (in diameter_gen) deal with it. Here we don't
-            %% know type. If the type isn't known, then the decode
-            %% just strips the extra bit.
+            %% Header length points past the end of the message, or
+            %% doesn't span the header. As stated in the 6733 text
+            %% above, it's sufficient to return a zero-filled minimal
+            %% payload if this is a request. Do this (in cases that we
+            %% know the type) by inducing a decode failure and letting
+            %% the dictionary's decode (in diameter_gen) deal with it.
+            %% Here we don't know type. If the type isn't known, then
+            %% the decode just strips the extra bit.
             {<<0:1, Bin/binary>>, <<>>}
     end.
 
@@ -585,6 +585,8 @@ split_data(Bin, Len) ->
 %% dictionary doesn't know about specific AVP's.
 
 %% Grouped AVP whose components need packing ...
+pack_avp([#diameter_avp{} = A | Avps]) ->
+    pack_avp(A#diameter_avp{data = Avps});
 pack_avp(#diameter_avp{data = [#diameter_avp{} | _] = Avps} = A) ->
     pack_avp(A#diameter_avp{data = encode_avps(Avps)});