diff --git a/logsrvd/logsrvd.c b/logsrvd/logsrvd.c
index 0f9b565a9..4eba07e07 100644
--- a/logsrvd/logsrvd.c
+++ b/logsrvd/logsrvd.c
@@ -1503,6 +1503,7 @@ listener_cb(int fd, int what, void *v)
     int sock;
     debug_decl(listener_cb, SUDO_DEBUG_UTIL);
 
+    memset(&sa_un, 0, sizeof(sa_un));
     sock = accept(fd, &sa_un.sa, &salen);
     if (sock != -1) {
 	if (logsrvd_conf_server_tcp_keepalive()) {
diff --git a/plugins/sudoers/cvtsudoers_csv.c b/plugins/sudoers/cvtsudoers_csv.c
index b13861d63..63512c5dc 100644
--- a/plugins/sudoers/cvtsudoers_csv.c
+++ b/plugins/sudoers/cvtsudoers_csv.c
@@ -574,6 +574,9 @@ print_cmndspec_csv(FILE *fp, struct sudoers_parse_tree *parse_tree,
 	}
     }
 #endif /* HAVE_PRIV_SET */
+#ifdef __clang_analyzer__
+    (void)&need_comma;
+#endif
     putc('"', fp);
     putc(',', fp);