Fixing clang-analyzer nits

diff --git a/daemon/tls_ephemeral_credentials.c b/daemon/tls_ephemeral_credentials.c
index a3725d62a22d08512250703020f2d073028e832f..f46780619c04a9386ef44e32a74c20ef0018c9d2 100644 (file)
--- 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 ed5b2601848d84bfceecf7fe57881b40732b4018..0eafbef7bfccfa59d958f33fe336ea06ca70d627 100644 (file)
--- 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;