diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-07-20 13:42:13 -0700 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-07-24 07:57:39 -0700 |
| commit | ccc24a8e508131a2226474642a038baaa2cbcc8c (patch) | |
| tree | 7029f7668fe3e1a9899da57bf6c1e60e0394bacb /src/supplemental/tls | |
| parent | 9b9526e4a643d36d9c66f2254f00df7298e5562f (diff) | |
| download | nng-ccc24a8e508131a2226474642a038baaa2cbcc8c.tar.gz nng-ccc24a8e508131a2226474642a038baaa2cbcc8c.tar.bz2 nng-ccc24a8e508131a2226474642a038baaa2cbcc8c.zip | |
fixes #605 NNI_ALLOC_STRUCT/NNI_ALLOC_STRUCTS should zero memory
Diffstat (limited to 'src/supplemental/tls')
| -rw-r--r-- | src/supplemental/tls/mbedtls/tls.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/supplemental/tls/mbedtls/tls.c b/src/supplemental/tls/mbedtls/tls.c index 0f4f67cc..42333783 100644 --- a/src/supplemental/tls/mbedtls/tls.c +++ b/src/supplemental/tls/mbedtls/tls.c @@ -319,11 +319,11 @@ nni_tls_init(nni_tls **tpp, nng_tls_config *cfg, nni_tcp_conn *tcp) if ((tp = NNI_ALLOC_STRUCT(tp)) == NULL) { return (NNG_ENOMEM); } - if ((tp->recvbuf = nni_alloc(NNG_TLS_MAX_RECV_SIZE)) == NULL) { + if ((tp->recvbuf = nni_zalloc(NNG_TLS_MAX_RECV_SIZE)) == NULL) { NNI_FREE_STRUCT(tp); return (NNG_ENOMEM); } - if ((tp->sendbuf = nni_alloc(NNG_TLS_MAX_SEND_SIZE)) == NULL) { + if ((tp->sendbuf = nni_zalloc(NNG_TLS_MAX_SEND_SIZE)) == NULL) { nni_free(tp->sendbuf, NNG_TLS_MAX_RECV_SIZE); NNI_FREE_STRUCT(tp); return (NNG_ENOMEM); @@ -957,12 +957,11 @@ nng_tls_config_ca_file(nng_tls_config *cfg, const char *path) if ((rv = nni_file_get(path, &fdata, &fsize)) != 0) { return (rv); } - if ((pem = nni_alloc(fsize + 1)) == NULL) { + if ((pem = nni_zalloc(fsize + 1)) == NULL) { nni_free(fdata, fsize); return (NNG_ENOMEM); } memcpy(pem, fdata, fsize); - pem[fsize] = '\0'; nni_free(fdata, fsize); if (strstr(pem, "-----BEGIN X509 CRL-----") != NULL) { rv = nng_tls_config_ca_chain(cfg, pem, pem); @@ -992,12 +991,11 @@ nng_tls_config_cert_key_file( if ((rv = nni_file_get(path, &fdata, &fsize)) != 0) { return (rv); } - if ((pem = nni_alloc(fsize + 1)) == NULL) { + if ((pem = nni_zalloc(fsize + 1)) == NULL) { nni_free(fdata, fsize); return (NNG_ENOMEM); } memcpy(pem, fdata, fsize); - pem[fsize] = '\0'; nni_free(fdata, fsize); rv = nng_tls_config_own_cert(cfg, pem, pem, pass); nni_free(pem, fsize + 1); |