Merge branch 'free_memory_in_error_case' of https://github.com/borisVanhoof/unbound into borisVanhoof-free_memory_in_error_case

gthess · gthess · commit 201da1f50a56 · 2023-07-21T17:04:33.000+02:00
diff --git a/contrib/Dockerfile.tests b/contrib/Dockerfile.tests
@@ -1,10 +1,8 @@
 FROM gcc:latest
 WORKDIR /usr/src/unbound
-RUN apt-get update
 # install semantic parser & lexical analyzer
-RUN apt-get install -y bison flex
 # install packages used in tests
-RUN apt-get install -y ldnsutils dnsutils xxd splint doxygen netcat
+RUN apt-get update && apt-get install -y bison flex ldnsutils dnsutils xxd splint doxygen netcat-traditional
 # accept short rsa keys, which are used in tests
 RUN sed -i 's/SECLEVEL=2/SECLEVEL=1/g' /usr/lib/ssl/openssl.cnf
 
diff --git a/iterator/iterator.c b/iterator/iterator.c
@@ -1121,7 +1121,7 @@ generate_a_aaaa_check(struct module_qstate* qstate, struct iter_qstate* iq,
  * Generate a NS check request to obtain authoritative information
  * on an NS rrset.
  *
- * @param qstate: the qtstate that triggered the need to prime.
+ * @param qstate: the qstate that triggered the need to prime.
  * @param iq: iterator query state.
  * @param id: module id.
  */
diff --git a/services/mesh.c b/services/mesh.c
@@ -457,13 +457,14 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,
 			s->s.edns_opts_front_in = edns_opt_copy_region(edns->opt_list_in,
 				s->s.region);
 			if(!s->s.edns_opts_front_in) {
-				log_err("mesh_state_create: out of memory; SERVFAIL");
+				log_err("edns_opt_copy_region: out of memory; SERVFAIL");
 				if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL,
 					NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, mesh->env->now_tv))
 						edns->opt_list_inplace_cb_out = NULL;
 				error_encode(r_buffer, LDNS_RCODE_SERVFAIL,
 					qinfo, qid, qflags, edns);
 				comm_point_send_reply(rep);
+				mesh_state_delete(&s->s);
 				return;
 			}
 		}
@@ -576,6 +577,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,
 			s->s.edns_opts_front_in = edns_opt_copy_region(edns->opt_list_in,
 				s->s.region);
 			if(!s->s.edns_opts_front_in) {
+				mesh_state_delete(&s->s);
 				return 0;
 			}
 		}
@@ -892,12 +894,6 @@ mesh_state_create(struct module_env* env, struct query_info* qinfo,
 	return mstate;
 }
 
-int
-mesh_state_is_unique(struct mesh_state* mstate)
-{
-	return mstate->unique != NULL;
-}
-
 void
 mesh_state_make_unique(struct mesh_state* mstate)
 {
diff --git a/services/mesh.h b/services/mesh.h
@@ -480,14 +480,6 @@ struct mesh_state* mesh_state_create(struct module_env* env,
 	struct query_info* qinfo, struct respip_client_info* cinfo,
 	uint16_t qflags, int prime, int valrec);
 
-/**
- * Check if the mesh state is unique.
- * A unique mesh state uses it's unique member to point to itself, else NULL.
- * @param mstate: mesh state to check.
- * @return true if the mesh state is unique, false otherwise.
- */
-int mesh_state_is_unique(struct mesh_state* mstate);
-
 /**
  * Make a mesh state unique.
  * A unique mesh state uses it's unique member to point to itself.

Original file line number	Diff line number	Diff line change
`@@ -1121,7 +1121,7 @@ generate_a_aaaa_check(struct module_qstate* qstate, struct iter_qstate* iq,`
`1121`	`1121`	`* Generate a NS check request to obtain authoritative information`
`1122`	`1122`	`* on an NS rrset.`
`1123`	`1123`	`*`
`1124`		`- * @param qstate: the qtstate that triggered the need to prime.`
	`1124`	`+ * @param qstate: the qstate that triggered the need to prime.`
`1125`	`1125`	`* @param iq: iterator query state.`
`1126`	`1126`	`* @param id: module id.`
`1127`	`1127`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -457,13 +457,14 @@ void mesh_new_client(struct mesh_area* mesh, struct query_info* qinfo,`
`457`	`457`	`s->s.edns_opts_front_in = edns_opt_copy_region(edns->opt_list_in,`
`458`	`458`	`s->s.region);`
`459`	`459`	`if(!s->s.edns_opts_front_in) {`
`460`		`- log_err("mesh_state_create: out of memory; SERVFAIL");`
	`460`	`+ log_err("edns_opt_copy_region: out of memory; SERVFAIL");`
`461`	`461`	`if(!inplace_cb_reply_servfail_call(mesh->env, qinfo, NULL,`
`462`	`462`	`NULL, LDNS_RCODE_SERVFAIL, edns, rep, mesh->env->scratch, mesh->env->now_tv))`
`463`	`463`	`edns->opt_list_inplace_cb_out = NULL;`
`464`	`464`	`error_encode(r_buffer, LDNS_RCODE_SERVFAIL,`
`465`	`465`	`qinfo, qid, qflags, edns);`
`466`	`466`	`comm_point_send_reply(rep);`
	`467`	`+ mesh_state_delete(&s->s);`
`467`	`468`	`return;`
`468`	`469`	`}`
`469`	`470`	`}`
`@@ -576,6 +577,7 @@ mesh_new_callback(struct mesh_area* mesh, struct query_info* qinfo,`
`576`	`577`	`s->s.edns_opts_front_in = edns_opt_copy_region(edns->opt_list_in,`
`577`	`578`	`s->s.region);`
`578`	`579`	`if(!s->s.edns_opts_front_in) {`
	`580`	`+ mesh_state_delete(&s->s);`
`579`	`581`	`return 0;`
`580`	`582`	`}`
`581`	`583`	`}`
`@@ -892,12 +894,6 @@ mesh_state_create(struct module_env* env, struct query_info* qinfo,`
`892`	`894`	`return mstate;`
`893`	`895`	`}`
`894`	`896`
`895`		`-int`
`896`		`-mesh_state_is_unique(struct mesh_state* mstate)`
`897`		`-{`
`898`		`- return mstate->unique != NULL;`
`899`		`-}`
`900`		`-`
`901`	`897`	`void`
`902`	`898`	`mesh_state_make_unique(struct mesh_state* mstate)`
`903`	`899`	`{`