diff options
author | Toni Uhlig <matzeton@googlemail.com> | 2018-10-27 16:26:33 +0200 |
---|---|---|
committer | Toni Uhlig <matzeton@googlemail.com> | 2018-10-27 16:26:33 +0200 |
commit | f7b21273b33bce95e6980180b677d101a2db8fcd (patch) | |
tree | 6a8b80b41d0912d6f996ef6c30a27d74a754a74e | |
parent | ae3ff185526ac4a0c1b50398c79d43af0cbbb4df (diff) |
coverity fixup's
Signed-off-by: Toni Uhlig <matzeton@googlemail.com>
-rw-r--r-- | src/ui.c | 3 | ||||
-rw-r--r-- | src/ui_nask.c | 5 | ||||
-rw-r--r-- | src/ui_statusbar.c | 1 | ||||
-rw-r--r-- | src/utils.c | 3 |
4 files changed, 8 insertions, 4 deletions
@@ -179,7 +179,8 @@ do_ui_update(bool timed_out) if (postupdate_callback(timed_out) != UICB_OK) return UICB_ERR_CB; - move(cur_y, cur_x); + if (move(cur_y, cur_x) == ERR) + return UICB_ERR_CB; refresh(); return (retval); } diff --git a/src/ui_nask.c b/src/ui_nask.c index 11f9123..cb6cb3b 100644 --- a/src/ui_nask.c +++ b/src/ui_nask.c @@ -69,7 +69,7 @@ netinfo_statusbar_update(WINDOW *win, struct statusbar *bar, bool ui_timeout) netupd = NETUPD_INTERVAL; size_t len = 0; char buf[NETUPD_STRLEN+1]; - char *dev, *gwIp, *myIp; + char *dev = NULL, *gwIp, *myIp; memset(buf, '\0', NETUPD_STRLEN+1); if (utGetDefaultGwInfo(&dev, &gwIp) == 0) { if (utGetIpFromNetDev(dev, &myIp) == 0) { @@ -85,9 +85,10 @@ netinfo_statusbar_update(WINDOW *win, struct statusbar *bar, bool ui_timeout) #endif free(myIp); } - free(dev); free(gwIp); } + if (dev) + free(dev); set_statusbar_text(bar, buf); } else { netupd--; diff --git a/src/ui_statusbar.c b/src/ui_statusbar.c index 8e183c6..03a77ac 100644 --- a/src/ui_statusbar.c +++ b/src/ui_statusbar.c @@ -85,6 +85,7 @@ set_statusbar_textf(struct statusbar *a, const char *format, ...) va_list ap; va_start(ap, format); int ret = vasprintf(&str, format, ap); + va_end(ap); if (ret != -1) set_statusbar_text(a, str); return ret; diff --git a/src/utils.c b/src/utils.c index b961f70..26ece4a 100644 --- a/src/utils.c +++ b/src/utils.c @@ -73,7 +73,8 @@ utGetIpFromNetDev(char *netdev, char **szIpPtr) memcpy(*szIpPtr, inet_ntoa(((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr), IFNAMSIZ-1); ret = 0; } - close(fd); + if (fd >= 0) + close(fd); return ret; } |