aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/src/base
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2019-02-13 12:40:26 +0100
committerAnders Svensson <[email protected]>2019-02-13 12:40:26 +0100
commit664d6d92f7b4d5c6b328f6e3503d372af70d74d6 (patch)
treee0668ddeaf0d67598cae19d9fc68db5a3893fe9b /lib/diameter/src/base
parent485713afa0d2481e93882bc386aebb06a49c04bc (diff)
parent6dfd7b201ae21054eab63a887767a7b280eb1b3f (diff)
downloadotp-664d6d92f7b4d5c6b328f6e3503d372af70d74d6.tar.gz
otp-664d6d92f7b4d5c6b328f6e3503d372af70d74d6.tar.bz2
otp-664d6d92f7b4d5c6b328f6e3503d372af70d74d6.zip
Merge branch 'anders/diameter/nocatch/OTP-15569' into maint
* anders/diameter/nocatch/OTP-15569: Update appup Fix nocatch on incoming answer with faulty Experimental-Result-Code
Diffstat (limited to 'lib/diameter/src/base')
-rw-r--r--lib/diameter/src/base/diameter_gen.erl2
-rw-r--r--lib/diameter/src/base/diameter_traffic.erl2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_gen.erl b/lib/diameter/src/base/diameter_gen.erl
index d110a3015e..564448de48 100644
--- a/lib/diameter/src/base/diameter_gen.erl
+++ b/lib/diameter/src/base/diameter_gen.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2018. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2019. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/diameter/src/base/diameter_traffic.erl b/lib/diameter/src/base/diameter_traffic.erl
index d2856ae530..2d3e4a2ac9 100644
--- a/lib/diameter/src/base/diameter_traffic.erl
+++ b/lib/diameter/src/base/diameter_traffic.erl
@@ -1925,6 +1925,8 @@ get_avp(Dict, Name, [#diameter_header{} | Avps]) ->
A = find_avp(Code, Vid, Avps),
avp_decode(Dict, Name, ungroup(A))
catch
+ {diameter_gen, _} -> %% faulty Grouped AVP
+ undefined;
error: _ ->
undefined
end;