advance map iterators with model_map_it_remove when removing items fr…

…om iterated map (#822)

lib/ziti-tunnel-cbs/ziti_dns.c

@@ -370,22 +370,24 @@ void ziti_dns_deregister_intercept(void *intercept) {
         dns_entry_t *e = model_map_it_value(it);
         model_map_remove_key(&e->intercepts, &intercept, sizeof(intercept));
         if (model_map_size(&e->intercepts) == 0 && (e->domain == NULL || model_map_size(&e->domain->intercepts) == 0)) {
-            model_map_remove(&ziti_dns.hostnames, e->name);
+            it = model_map_it_remove(it);
             model_map_removel(&ziti_dns.ip_addresses, ip_2_ip4(&e->addr)->addr);
             ZITI_LOG(DEBUG, "%zu active hostnames mapped to %zu IPs", model_map_size(&ziti_dns.hostnames), model_map_size(&ziti_dns.ip_addresses));
             ZITI_LOG(INFO, "DNS mapping %s -> %s is now inactive", e->name, e->ip);
+        } else {
+            it = model_map_it_next(it);
         }
-        it = model_map_it_next(it);
     }
 
     it = model_map_iterator(&ziti_dns.domains);
     while (it != NULL) {
         dns_domain_t *domain = model_map_it_value(it);
         if (model_map_size(&domain->intercepts) == 0) {
-            model_map_remove(&ziti_dns.domains, domain->name);
+            it = model_map_it_remove(it);
             ZITI_LOG(INFO, "wildcard domain[*%s] is now inactive", domain->name);
+        } else {
+            it = model_map_it_next(it);
         }
-        it = model_map_it_next(it);
     }
 }