From 1fe84966a887b30c70e71687bec5463d6710be54 Mon Sep 17 00:00:00 2001 From: Jaroslav Kysela Date: Fri, 3 Oct 2014 21:14:34 +0200 Subject: [PATCH] capmt: coverity fixes --- src/descrambler/capmt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/descrambler/capmt.c b/src/descrambler/capmt.c index b5d5b199..802a9f76 100644 --- a/src/descrambler/capmt.c +++ b/src/descrambler/capmt.c @@ -462,14 +462,17 @@ capmt_connect(capmt_t *capmt, int i) "%s", capmt->capmt_sockfile); fd = tvh_socket(AF_LOCAL, SOCK_STREAM, 0); - if (connect(fd, (const struct sockaddr*)&serv_addr_un, + if (fd < 0 || + connect(fd, (const struct sockaddr*)&serv_addr_un, sizeof(serv_addr_un)) != 0) { if (tvheadend_running) tvhlog(LOG_ERR, "capmt", "%s: Cannot connect to %s (%s); Do you have OSCam running?", capmt_name(capmt), capmt->capmt_sockfile, strerror(errno)); - close(fd); - fd = -1; + if (fd >= 0) { + close(fd); + fd = -1; + } } }