Completely remove service entry from routing info structure when no

instance is available anymore. Otherwise, malformed routing info
messages are generated from the routing manager stub which crash the
attached routing manager proxies.

1 files changed, 3 insertions, 0 deletions

diff --git a/implementation/routing/src/routing_manager_stub.cpp b/implementation/routing/src/routing_manager_stub.cpp
index fe769d2..265a9c9 100644
--- a/implementation/routing/src/routing_manager_stub.cpp
+++ b/implementation/routing/src/routing_manager_stub.cpp
@@ -228,6 +228,9 @@ void routing_manager_stub::on_stop_offer_service(client_t _client,
 			auto found_instance = found_service->second.find(_instance);
 			if (found_instance != found_service->second.end()) {
 				found_service->second.erase(_instance);
+				if (0 == found_service->second.size()) {
+					found_client->second.second.erase(_service);
+				}
 				broadcast_routing_info();
 			}
 		}