aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter/test/diameter_config_SUITE.erl
diff options
context:
space:
mode:
authorAnders Svensson <[email protected]>2015-03-27 17:02:26 +0100
committerAnders Svensson <[email protected]>2015-03-27 17:02:26 +0100
commit45f33f09d56af793a2142ab402d73868be30b223 (patch)
tree7ca20b645e56555f498c18e44ab3b8ea8a1f73a4 /lib/diameter/test/diameter_config_SUITE.erl
parentcbceea683c9f718bc6f0140c2402a7f74455ea14 (diff)
parent39acfdb005626ae1bf2f68808f9e8116637c7121 (diff)
downloadotp-45f33f09d56af793a2142ab402d73868be30b223.tar.gz
otp-45f33f09d56af793a2142ab402d73868be30b223.tar.bz2
otp-45f33f09d56af793a2142ab402d73868be30b223.zip
Merge branch 'anders/diameter/hardening/OTP-12628' into maint
* anders/diameter/hardening/OTP-12628: Remove potentially large error reason in call to diameter_lib:log/4 Limit FQDN in DiameterURI to 255 octets Limit DiameterURI ports to 0-65535 digits on decode Add service_opt() incoming_maxlen Add guard to reject {spawn_opt, false} as transport/service_opt()
Diffstat (limited to 'lib/diameter/test/diameter_config_SUITE.erl')
-rw-r--r--lib/diameter/test/diameter_config_SUITE.erl9
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/diameter/test/diameter_config_SUITE.erl b/lib/diameter/test/diameter_config_SUITE.erl
index 77f7aace1b..bbdf672291 100644
--- a/lib/diameter/test/diameter_config_SUITE.erl
+++ b/lib/diameter/test/diameter_config_SUITE.erl
@@ -85,6 +85,12 @@
{string_decode,
[[true], [false]],
[[0], [x]]},
+ {incoming_maxlen,
+ [[0], [65536], [16#FFFFFF]],
+ [[-1], [1 bsl 24], [infinity], [false]]},
+ {spawn_opt,
+ [[[]], [[monitor, link]]],
+ [[false]]},
{invalid_option, %% invalid service options are rejected
[],
[[x],
@@ -186,6 +192,9 @@
{private,
[[x]],
[]},
+ {spawn_opt,
+ [[[]], [[monitor, link]]],
+ [[false]]},
{invalid_option, %% invalid transport options are silently ignored
[[x],
[x,x]],