Fix missing mutex destroy and ede invalidate on fctx_create() error paths

The error cleanup in fctx_create() was missing isc_mutex_destroy() and
dns_ede_invalidate() calls. When error paths (cleanup_nameservers,
cleanup_fcount, cleanup_qmessage, cleanup_adb) were taken after the
mutex and edectx were initialized, the fctx memory was freed without
properly destroying these resources first.

(cherry picked from commit 5b1750f15fe9e5b7914419dab23bef1e7e72d13e)

diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index 24e2d8f1f0d23e96827fb307ccf57be462c1b4bd..d114180401c644c80082bdd504091906efea4535 100644 (file)
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -4967,6 +4967,9 @@ cleanup_nameservers:
        }
 
 cleanup_fetch:
+
+       dns_ede_invalidate(&fctx->edectx);
+       isc_mutex_destroy(&fctx->lock);
        dns_resolver_detach(&fctx->res);
        isc_mem_putanddetach(&fctx->mctx, fctx, sizeof(*fctx));