From 21c4f82b8e68a95e41c70f247efe993b48f2cb7d Mon Sep 17 00:00:00 2001
From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 17 Jun 2022 13:46:31 +0200
Subject: [PATCH] Only erase if we know the edns entry exists

---
 pdns/syncres.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pdns/syncres.cc b/pdns/syncres.cc
index 15fbbed165..3745042add 100644
--- a/pdns/syncres.cc
+++ b/pdns/syncres.cc
@@ -1567,7 +1567,10 @@ LWResult::Result SyncRes::asyncresolveWrapper(const ComboAddress& ip, bool ednsM
         lock->setMode(ind, ednsstatus, EDNSStatus::EDNSIGNORANT, d_now.tv_sec);
       }
       else {
-        lock->erase(ip);
+        // New status is EDNSOK
+        if (ednsstatus != lock->end()) {
+          lock->erase(ip);
+        }
       }
     }
 
-- 
2.47.2