aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2015-09-10 15:53:25 +0200
committerIngela Anderton Andin <[email protected]>2015-09-10 15:53:25 +0200
commitd96d6c5b4df80a37e03ec0d7b72b02fa087e5dee (patch)
tree78c0d2d98e00e3af77e20d76b623f5ba3eb5aaf6 /erts
parent5e8884f456626426c71a5b398ebc41e884e2dc39 (diff)
parentaa0c98308a8e77b9d9b77a845494673cbe1c4e04 (diff)
downloadotp-d96d6c5b4df80a37e03ec0d7b72b02fa087e5dee.tar.gz
otp-d96d6c5b4df80a37e03ec0d7b72b02fa087e5dee.tar.bz2
otp-d96d6c5b4df80a37e03ec0d7b72b02fa087e5dee.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/drivers/common/inet_drv.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/emulator/drivers/common/inet_drv.c b/erts/emulator/drivers/common/inet_drv.c
index 31b4b22081..cc8c203263 100644
--- a/erts/emulator/drivers/common/inet_drv.c
+++ b/erts/emulator/drivers/common/inet_drv.c
@@ -2520,7 +2520,7 @@ int ssl_tls_inetdrv(void* arg, unsigned type, unsigned major, unsigned minor,
{
tcp_descriptor* desc = (tcp_descriptor*) arg;
int i = 0;
- ErlDrvTermData spec[28];
+ ErlDrvTermData spec[30];
ErlDrvTermData caller = ERL_DRV_NIL;
ErlDrvBinary* bin;
int ret;
@@ -2561,11 +2561,11 @@ int ssl_tls_inetdrv(void* arg, unsigned type, unsigned major, unsigned minor,
if (desc->inet.active == INET_PASSIVE) {
i = LOAD_TUPLE(spec, i, 2);
i = LOAD_TUPLE(spec, i, 4);
- ASSERT(i <= 28);
+ ASSERT(i <= sizeof(spec)/sizeof(*spec));
ret = erl_drv_send_term(desc->inet.dport, caller, spec, i);
}
else {
- ASSERT(i <= 28);
+ ASSERT(i <= sizeof(spec)/sizeof(*spec));
ret = erl_drv_output_term(desc->inet.dport, spec, i);
}
done: