diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-09 05:50:57 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-09 05:50:57 +0000 |
| commit | 68fed3306b1f39bfb6d5cd97485248dc0c3884f8 (patch) | |
| tree | 3b5358dd257bf44bb4ea15442ad4bdb078b6795f /crypto/openssl/crypto/bio/bss_dgram.c | |
| parent | e15884d6df140228c1e2db4ca751565a6933e1f5 (diff) | |
| parent | d4a5f67323e640990da5aa727b2e6da35d2157f3 (diff) | |
| download | FreeBSD-src-68fed3306b1f39bfb6d5cd97485248dc0c3884f8.zip FreeBSD-src-68fed3306b1f39bfb6d5cd97485248dc0c3884f8.tar.gz | |
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/openssl/crypto/bio/bss_dgram.c')
| -rw-r--r-- | crypto/openssl/crypto/bio/bss_dgram.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/crypto/openssl/crypto/bio/bss_dgram.c b/crypto/openssl/crypto/bio/bss_dgram.c index 54c012c..d9967e7 100644 --- a/crypto/openssl/crypto/bio/bss_dgram.c +++ b/crypto/openssl/crypto/bio/bss_dgram.c @@ -1333,7 +1333,7 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr) bio_dgram_sctp_data *data = NULL; socklen_t sockopt_len = 0; struct sctp_authkeyid authkeyid; - struct sctp_authkey *authkey; + struct sctp_authkey *authkey = NULL; data = (bio_dgram_sctp_data *)b->ptr; @@ -1388,6 +1388,11 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr) /* Add new key */ sockopt_len = sizeof(struct sctp_authkey) + 64 * sizeof(uint8_t); authkey = OPENSSL_malloc(sockopt_len); + if (authkey == NULL) + { + ret = -1; + break; + } memset(authkey, 0x00, sockopt_len); authkey->sca_keynumber = authkeyid.scact_keynumber + 1; #ifndef __FreeBSD__ @@ -1399,6 +1404,8 @@ static long dgram_sctp_ctrl(BIO *b, int cmd, long num, void *ptr) memcpy(&authkey->sca_key[0], ptr, 64 * sizeof(uint8_t)); ret = setsockopt(b->num, IPPROTO_SCTP, SCTP_AUTH_KEY, authkey, sockopt_len); + OPENSSL_free(authkey); + authkey = NULL; if (ret < 0) break; /* Reset active key */ |
