- Fix unbound dnstap socket test program analyzer warnings about

unused variable assignments and variable initialization.
NLnetLabs · Sep 30, 2024 · 5bb3b9c · 5bb3b9c
1 parent 3a1b79f
commit 5bb3b9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/dnstap/unbound-dnstap-socket.c b/dnstap/unbound-dnstap-socket.c
@@ -1151,7 +1151,9 @@ void dtio_mainfdcallback(int fd, short ATTR_UNUSED(bits), void* arg)
 	char* id = NULL;
 	struct sockaddr_storage addr;
 	socklen_t addrlen = (socklen_t)sizeof(addr);
-	int s = accept(fd, (struct sockaddr*)&addr, &addrlen);
+	int s;
+	memset(&addr, 0, sizeof(addr));
+	s = accept(fd, (struct sockaddr*)&addr, &addrlen);
 	if(s == -1) {
 #ifndef USE_WINSOCK
 		/* EINTR is signal interrupt. others are closed connection. */
@@ -1543,8 +1545,8 @@ int main(int argc, char** argv)
 				usage(argv);
 		}
 	}
-	argc -= optind;
-	argv += optind;
+	/* argc -= optind; not using further arguments */
+	/* argv += optind; not using further arguments */
 
 	if(usessl) {
 #ifdef HAVE_SSL

diff --git a/doc/Changelog b/doc/Changelog
@@ -1,6 +1,8 @@
 30 September 2024: Wouter
 	- Fix negative cache NSEC3 parameter compares for zero length NSEC3
 	  salt.
+	- Fix unbound dnstap socket test program analyzer warnings about
+	  unused variable assignments and variable initialization.
 
 25 September 2024: Wouter
 	- Fix #1144: [FR] log timestamps in ISO8601 format with timezone.