- For #1103: fix to also drop mesh state reference when a h2 reply is

  dropped.

diff --git a/doc/Changelog b/doc/Changelog
index bc71af26dc0463cf423c1fac083f447e89b39505..88857239b82f787a445efc61561182c85de0ffa7 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,8 @@
 
 12 July 2024: Wouter
        - Fix #1103: unbound 1.20.0 segmentation fault with nghttp2.
+       - For #1103: fix to also drop mesh state reference when a h2 reply is
+         dropped.
 
 10 July 2024: Wouter
        - For #773: In contrib/unbound.service.in set unbound to start after

diff --git a/services/mesh.c b/services/mesh.c
index d3811b475115085f85685ce770792126c0bd3d5c..fa03c63d8a9628587cd715bf6d5439ee0762d027 100644 (file)
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -974,6 +974,9 @@ mesh_state_cleanup(struct mesh_state* mstate)
                for(; rep; rep=rep->next) {
                        infra_wait_limit_dec(mesh->env->infra_cache,
                                &rep->query_reply, mesh->env->cfg);
+                       if(rep->query_reply.c->use_h2)
+                               http2_stream_remove_mesh_state(
+                                       rep->query_reply.c->h2_stream);
                        comm_point_drop_reply(&rep->query_reply);
                        log_assert(mesh->num_reply_addrs > 0);
                        mesh->num_reply_addrs--;