From d3bc6c3894a60e3a2bd399b118f43fcb2abdbaac Mon Sep 17 00:00:00 2001 From: Ji-hoon Lee Date: Tue, 29 Dec 2020 22:02:01 +0900 Subject: [PATCH] Add NULL check before calling dbus_bus_release_name() Change-Id: I8ffc6bb4b4cf1eed1604a8a26067a733c5601843 --- src/service_ipc_dbus.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/service_ipc_dbus.cpp b/src/service_ipc_dbus.cpp index bb1c3fa..f8027cd 100644 --- a/src/service_ipc_dbus.cpp +++ b/src/service_ipc_dbus.cpp @@ -1246,11 +1246,14 @@ int CServiceIpcDbus::close_connection() mFdHandler = NULL; } - dbus_bus_release_name(mConnectionListener, MA_SERVER_SERVICE_NAME, &err); - - if (dbus_error_is_set(&err)) { - MAS_LOGE("[Dbus ERROR] dbus_bus_release_name() : %s", err.message); - dbus_error_free(&err); + if (NULL != mConnectionListener) { + dbus_bus_release_name(mConnectionListener, MA_SERVER_SERVICE_NAME, &err); + if (dbus_error_is_set(&err)) { + MAS_LOGE("[Dbus ERROR] dbus_bus_release_name() : %s", err.message); + dbus_error_free(&err); + } + } else { + MAS_LOGE("mConnectionListener is NULL!!"); } connection_free(); -- 2.7.4