From 1641d13cf9ae98828f938854d183a09f8edd574a Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Wed, 10 Jun 2026 21:39:43 +0000
Subject: [PATCH] Defensive checks for null or corrupt structures

---
 TargetGroup.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/TargetGroup.cc b/TargetGroup.cc
index 6ba5fa004..b00b36c27 100644
--- a/TargetGroup.cc
+++ b/TargetGroup.cc
@@ -125,20 +125,21 @@ bool TargetGroup::load_expressions(HostGroupState *hs, int af) {
       rit != requests.end(); rit++) {
     const DNS::Request &req = *rit;
     NetBlock *nb_old = (NetBlock *) req.userdata;
+    assert(nb_old != NULL);
     NetBlock *nb_new = nb_old->resolve(req);
     nb_it = std::find(nb_it, netblocks.end(), nb_old);
+    assert(nb_it != netblocks.end());
 
     if (nb_new == NULL) {
       // Resolution failed; remove the NetBlock
       nb_it = netblocks.erase(nb_it);
-      delete nb_old;
     }
     else {
       assert (nb_new != nb_old);
       // Resolution succeeded; replace the NetBlock
       *nb_it = nb_new;
-      delete nb_old;
     }
+    delete nb_old;
   }
   requests.clear();
   return !netblocks.empty();