From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 30 Aug 2023 12:31:24 +0000 (+0200)
Subject: - Fix for WKS call to getservbyname that creates allocation on exit
X-Git-Tag: release-1.19.0rc1~60
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4c4537b33463fb120615b4b8b7d91629ae11bb6;p=thirdparty%2Funbound.git

- Fix for WKS call to getservbyname that creates allocation on exit
  in unit test by testing numbers first and testing from the services
  list later.
---

diff --git a/doc/Changelog b/doc/Changelog
index 656cfdab2..85f86ba26 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+30 August 2023: Wouter
+	- Fix for WKS call to getservbyname that creates allocation on exit
+	  in unit test by testing numbers first and testing from the services
+	  list later.
+
 28 August 2023: Wouter
 	- Fix for version generation race condition that ignored changes.
 
diff --git a/sldns/str2wire.c b/sldns/str2wire.c
index 45e247613..fdd40e0f2 100644
--- a/sldns/str2wire.c
+++ b/sldns/str2wire.c
@@ -2459,12 +2459,13 @@ int sldns_str2wire_wks_buf(const char* str, uint8_t* rd, size_t* len)
 			(void)strlcpy(proto_str, token, sizeof(proto_str));
 		} else {
 			int serv_port;
-			struct servent *serv = getservbyname(token, proto_str);
-			if(serv) serv_port=(int)ntohs((uint16_t)serv->s_port);
+			if(atoi(token) != 0) serv_port=atoi(token);
+			else if(strcmp(token, "0") == 0) serv_port=0;
 			else if(strcasecmp(token, "domain")==0) serv_port=53;
 			else {
-				serv_port = atoi(token);
-				if(serv_port == 0 && strcmp(token, "0") != 0) {
+				struct servent *serv = getservbyname(token, proto_str);
+				if(serv) serv_port=(int)ntohs((uint16_t)serv->s_port);
+				else {
 #ifdef HAVE_ENDSERVENT
 					endservent();
 #endif
@@ -2474,16 +2475,16 @@ int sldns_str2wire_wks_buf(const char* str, uint8_t* rd, size_t* len)
 					return RET_ERR(LDNS_WIREPARSE_ERR_SYNTAX,
 						sldns_buffer_position(&strbuf));
 				}
-				if(serv_port < 0 || serv_port > 65535) {
+			}
+			if(serv_port < 0 || serv_port > 65535) {
 #ifdef HAVE_ENDSERVENT
-					endservent();
+				endservent();
 #endif
 #ifdef HAVE_ENDPROTOENT
-					endprotoent();
+				endprotoent();
 #endif
-					return RET_ERR(LDNS_WIREPARSE_ERR_SYNTAX,
-						sldns_buffer_position(&strbuf));
-				}
+				return RET_ERR(LDNS_WIREPARSE_ERR_SYNTAX,
+					sldns_buffer_position(&strbuf));
 			}
 			if(rd_len < 1+serv_port/8+1) {
 				/* bitmap is larger, init new bytes at 0 */