- Fix infinite loop when reading multiple lines of input on a broken

remote control socket. Addesses #947 and #948.
NLnetLabs · Oct 10, 2023 · 516f90a · 516f90a
1 parent c09320c
commit 516f90a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/daemon/remote.c b/daemon/remote.c
@@ -590,7 +590,7 @@ ssl_read_line(RES* res, char* buf, size_t max)
 			while(1) {
 				ssize_t rr = recv(res->fd, buf+len, 1, 0);
 				if(rr <= 0) {
-					if(rr == 0) {
+					if(rr == 0 && len != 0) {
 						buf[len] = 0;
 						return 1;
 					}

diff --git a/doc/Changelog b/doc/Changelog
@@ -1,3 +1,7 @@
+10 October 2023: George
+	- Fix infinite loop when reading multiple lines of input on a broken
+	  remote control socket. Addesses #947 and #948.
+
 9 October 2023: Wouter
 	- Fix edns subnet so that queries with a source prefix of zero cause
 	  the recursor send no edns subnet option to the upstream.