[Git][NTPsec/ntpsec][master] 2 commits: Keep Coverity happy: free old strings in NTS config

[Hal Murray (@hal.murray)]

Hal Murray pushed to branch master at NTPsec / ntpsec


Commits:
51426ae3 by Hal Murray at 2025-01-14T01:58:13-08:00
Keep Coverity happy: free old strings in NTS config

- - - - -
f928b8bd by Hal Murray at 2025-01-14T02:12:51-08:00
Drop tiny piece of cruft that was avoiding free(NULL)

- - - - -


1 changed file:

- ntpd/ntp_config.c


Changes:

=====================================
ntpd/ntp_config.c
=====================================
@@ -480,9 +480,6 @@ create_attr_sval(
 
 	my_val = emalloc_zero(sizeof(*my_val));
 	my_val->attr = attr;
-	if (NULL == s) {			/* free() hates NULL */
-		s = estrdup("");
-	}
 	my_val->value.s = _UC(s);
 	my_val->type = T_String;
 
@@ -1959,18 +1956,22 @@ config_nts(
 			INSIST(0);
 			break;
 		case T_Aead:
+			free((void *)(intptr_t)ntsconfig.aead);
 			ntsconfig.aead = estrdup(nts->value.s);
 			break;
 
 		case T_Ca:
+			free((void *)(intptr_t)ntsconfig.ca);
 			ntsconfig.ca = estrdup(nts->value.s);
 			break;
 
 		case T_Cert:
+			free((void *)(intptr_t)ntsconfig.cert);
 			ntsconfig.cert = estrdup(nts->value.s);
 			break;
 
 		case T_Cookie:
+			free((void *)(intptr_t)ntsconfig.KI);
 			ntsconfig.KI = estrdup(nts->value.s);
 			break;
 
@@ -1983,14 +1984,17 @@ config_nts(
 			break;
 
 		case T_Key:
+			free((void *)(intptr_t)ntsconfig.key);
 			ntsconfig.key = estrdup(nts->value.s);
 			break;
 
 		case T_Maxtls:
+			free((void *)(intptr_t)ntsconfig.maxtls);
 			ntsconfig.maxtls = estrdup(nts->value.s);
 			break;
 
 		case T_Mintls:
+			free((void *)(intptr_t)ntsconfig.mintls);
 			ntsconfig.mintls = estrdup(nts->value.s);
 			break;
 
@@ -1999,14 +2003,17 @@ config_nts(
 			break;
 
 		case T_Tlscipherserverpreference:
+			free((void *)(intptr_t)ntsconfig.tlscipherserverpreference);
 			ntsconfig.tlscipherserverpreference = true;
 			break;
 
 		case T_Tlsciphersuites:
+			free((void *)(intptr_t)ntsconfig.tlsciphersuites);
 			ntsconfig.tlsciphersuites = estrdup(nts->value.s);
 			break;
 
 		case T_Tlsecdhcurves:
+			free((void *)(intptr_t)ntsconfig.tlsecdhcurves);
 			ntsconfig.tlsecdhcurves = estrdup(nts->value.s);
 			break;
 #endif



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/93bec7d1ac3275b6bd8cc962540f3cd0789e43c2...f928b8bd94e06dc0a9d10a9ef7dbe809d2e711a8

-- 
View it on GitLab: https://gitlab.com/NTPsec/ntpsec/-/compare/93bec7d1ac3275b6bd8cc962540f3cd0789e43c2...f928b8bd94e06dc0a9d10a9ef7dbe809d2e711a8
You're receiving this email because of your account on gitlab.com.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20250118/90e84808/attachment-0001.htm>