Merge branch 'master' of https://github.com/eaglegai/unbound into eaglegai-master

gthess · gthess · commit e839771ddf68 · 2023-07-21T12:43:47.000+02:00
diff --git a/smallapp/unbound-host.c b/smallapp/unbound-host.c
@@ -482,6 +482,7 @@ int main(int argc, char* argv[])
 		case '?':
 		case 'h':
 		default:
+			ub_ctx_delete(ctx);
 			usage();
 		}
 	}
@@ -495,8 +496,10 @@ int main(int argc, char* argv[])
 	}
 	argc -= optind;
 	argv += optind;
-	if(argc != 1)
+	if(argc != 1) {
+		ub_ctx_delete(ctx);
 		usage();
+	}
 
 #ifdef HAVE_SSL
 #ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS
diff --git a/testcode/streamtcp.c b/testcode/streamtcp.c
@@ -379,15 +379,19 @@ static void
 send_em(const char* svr, const char* pp2_client, int udp, int usessl,
 	int noanswer, int onarrival, int delay, int num, char** qs)
 {
-	sldns_buffer* buf = sldns_buffer_new(65553);
-	sldns_buffer* proxy_buf = sldns_buffer_new(65553);
 	struct sockaddr_storage svr_addr;
 	socklen_t svr_addrlen;
 	int fd = open_svr(svr, udp, &svr_addr, &svr_addrlen);
 	int i, wait_results = 0, pp2_parsed;
 	SSL_CTX* ctx = NULL;
 	SSL* ssl = NULL;
+	sldns_buffer* buf = sldns_buffer_new(65553);
 	if(!buf) fatal_exit("out of memory");
+	sldns_buffer* proxy_buf = sldns_buffer_new(65553);
+	if(!proxy_buf) {
+		sldns_buffer_free(buf);
+		fatal_exit("out of memory");
+	}
 	pp2_parsed = parse_pp2_client(pp2_client, udp, proxy_buf);
 	if(usessl) {
 		ctx = connect_sslctx_create(NULL, NULL, NULL, 0);

Original file line number	Diff line number	Diff line change
`@@ -482,6 +482,7 @@ int main(int argc, char* argv[])`
`482`	`482`	`case '?':`
`483`	`483`	`case 'h':`
`484`	`484`	`default:`
	`485`	`+ ub_ctx_delete(ctx);`
`485`	`486`	`usage();`
`486`	`487`	`}`
`487`	`488`	`}`
`@@ -495,8 +496,10 @@ int main(int argc, char* argv[])`
`495`	`496`	`}`
`496`	`497`	`argc -= optind;`
`497`	`498`	`argv += optind;`
`498`		`- if(argc != 1)`
	`499`	`+ if(argc != 1) {`
	`500`	`+ ub_ctx_delete(ctx);`
`499`	`501`	`usage();`
	`502`	`+ }`
`500`	`503`
`501`	`504`	`#ifdef HAVE_SSL`
`502`	`505`	`#ifdef HAVE_ERR_LOAD_CRYPTO_STRINGS`