From 40844a4a934a9b416e098a9b173e9e983adfa6dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Fri, 13 Jan 2017 11:21:17 +0100 Subject: [PATCH] Fixing clang-analyzer nits --- daemon/tls_ephemeral_credentials.c | 14 ++++++++------ daemon/worker.c | 1 - 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/daemon/tls_ephemeral_credentials.c b/daemon/tls_ephemeral_credentials.c index a3725d62a..f46780619 100644 --- a/daemon/tls_ephemeral_credentials.c +++ b/daemon/tls_ephemeral_credentials.c @@ -214,15 +214,17 @@ struct tls_credentials * tls_get_ephemeral_credentials(struct engine *engine) creds->ephemeral_servicename = strdup(engine_get_hostname(engine)); if (creds->ephemeral_servicename == NULL) { kr_log_error("[tls] could not get server's hostname, using '" INVALID_HOSTNAME "' instead\n"); - creds->ephemeral_servicename = strdup(INVALID_HOSTNAME); + if ((creds->ephemeral_servicename = strdup(INVALID_HOSTNAME)) == NULL) { + kr_log_error("[tls] failed to allocate memory for ephemeral credentials\n"); + goto failure; + } } - privkey = get_ephemeral_privkey(); - if (!privkey) + if ((privkey = get_ephemeral_privkey()) == NULL) { goto failure; - cert = get_ephemeral_cert(privkey, creds->ephemeral_servicename, now - 60*15, creds->valid_until); - if (!cert) + } + if ((cert = get_ephemeral_cert(privkey, creds->ephemeral_servicename, now - 60*15, creds->valid_until)) == NULL) { goto failure; - + } if ((err = gnutls_certificate_set_x509_key(creds->credentials, &cert, 1, privkey)) < 0) { kr_log_error("[tls] failed to set up ephemeral credentials\n"); goto failure; diff --git a/daemon/worker.c b/daemon/worker.c index ed5b26018..0eafbef7b 100644 --- a/daemon/worker.c +++ b/daemon/worker.c @@ -483,7 +483,6 @@ static int qr_task_send(struct qr_task *task, uv_handle_t *handle, struct sockad } } /* Send using given protocol */ - ret = 0; if (handle->type == UV_UDP) { uv_buf_t buf = { (char *)pkt->wire, pkt->size }; send_req->as.send.data = task; -- 2.47.3