summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPale Moon <git-repo@palemoon.org>2018-06-20 20:54:49 -0700
committerwolfbeast <mcwerewolf@gmail.com>2018-06-30 19:50:21 +0200
commit8d29394b4bc27b3575141685647df1509d687441 (patch)
treec50dc051e3ea39a03c0995573eabcff261abce3f
parent5054d5a119813a55bf02e341867dd39d0dc38c3d (diff)
downloadUXP-8d29394b4bc27b3575141685647df1509d687441.tar
UXP-8d29394b4bc27b3575141685647df1509d687441.tar.gz
UXP-8d29394b4bc27b3575141685647df1509d687441.tar.lz
UXP-8d29394b4bc27b3575141685647df1509d687441.tar.xz
UXP-8d29394b4bc27b3575141685647df1509d687441.zip
Cherry-pick user sctp rev SVN8789a6da02e2c7c03522bc6f275b302f6ef977fe
-rwxr-xr-xnetwerk/sctp/src/netinet/sctp_auth.c2
-rwxr-xr-xnetwerk/sctp/src/netinet/sctp_pcb.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/netwerk/sctp/src/netinet/sctp_auth.c b/netwerk/sctp/src/netinet/sctp_auth.c
index 50432ad8a..ee5ca36ce 100755
--- a/netwerk/sctp/src/netinet/sctp_auth.c
+++ b/netwerk/sctp/src/netinet/sctp_auth.c
@@ -1525,6 +1525,8 @@ sctp_auth_get_cookie_params(struct sctp_tcb *stcb, struct mbuf *m,
if (p_random != NULL) {
keylen = sizeof(*p_random) + random_len;
bcopy(p_random, new_key->key, keylen);
+ } else {
+ keylen = 0;
}
/* append in the AUTH chunks */
if (chunks != NULL) {
diff --git a/netwerk/sctp/src/netinet/sctp_pcb.c b/netwerk/sctp/src/netinet/sctp_pcb.c
index 297097025..58c164f50 100755
--- a/netwerk/sctp/src/netinet/sctp_pcb.c
+++ b/netwerk/sctp/src/netinet/sctp_pcb.c
@@ -7688,6 +7688,8 @@ sctp_load_addresses_from_init(struct sctp_tcb *stcb, struct mbuf *m,
if (p_random != NULL) {
keylen = sizeof(*p_random) + random_len;
bcopy(p_random, new_key->key, keylen);
+ } else {
+ keylen = 0;
}
/* append in the AUTH chunks */
if (chunks != NULL) {