Fixing dereference issues

Some code paths were possibly leading to NULL pointer dereferencing. A static analysis tool found some NULL pointer dereferencing with its_info and _info.
COVESA · Jan 9, 2025 · 72d7492 · 72d7492
1 parent d8eaf8c
commit 72d7492
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/implementation/routing/src/routing_manager_impl.cpp b/implementation/routing/src/routing_manager_impl.cpp
@@ -1070,7 +1070,7 @@ bool routing_manager_impl::send(client_t _client, const byte_t *_data,
                         } else {
                             if ((utility::is_response(_data[VSOMEIP_MESSAGE_TYPE_POS])
                                  || utility::is_error(_data[VSOMEIP_MESSAGE_TYPE_POS]))
-                                    && !its_info->is_local()) {
+                                    && its_info && !its_info->is_local()) {
                                 // We received a response/error but neither the hosting application
                                 // nor another local client could be found --> drop
                                 const session_t its_session = bithelper::read_uint16_be(&_data[VSOMEIP_SESSION_POS_MIN]);

diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp
@@ -2406,7 +2406,7 @@ void service_discovery_impl::handle_eventgroup_subscription(
     std::shared_ptr<endpoint_definition> its_unreliable;
 
     // wrong major version
-    if (_major != _info->get_major()) {
+    if (_info && _major != _info->get_major()) {
         // Create a temporary info object with TTL=0 --> send NACK
         auto its_info = std::make_shared<eventgroupinfo>(_service, _instance,
                 _eventgroup, _major, 0, VSOMEIP_DEFAULT_MAX_REMOTE_SUBSCRIBERS);