Merge pull request #1567 from Karry/fix-null-pointer-deref

fix null pointer dereference
Framstag · Apr 13, 2024 · 1326c9b · 1326c9b
2 parents 457317c + 6b73325
commit 1326c9b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/libosmscout/src/osmscout/routing/MultiDBRoutingService.cpp b/libosmscout/src/osmscout/routing/MultiDBRoutingService.cpp
@@ -101,10 +101,14 @@ namespace osmscout {
     }
 
     for (auto& handle : handles) {
-      handle.routingDatabase->Close();
-      handle.routingDatabase.reset();
-      handle.router->Close();
-      handle.router.reset();
+      if (handle.routingDatabase) {
+        handle.routingDatabase->Close();
+        handle.routingDatabase.reset();
+      }
+      if (handle.router) {
+        handle.router->Close();
+        handle.router.reset();
+      }
       handle.profile.reset();
     }