From 2123c77bd9191a1505b8bfd840753c36ba08e285 Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Fri, 18 Jun 2021 13:52:48 +0900 Subject: [PATCH] Fix Coverity issues Change-Id: I414cae23a31733f0b58530676d049f0c6fdb6f96 Signed-off-by: Jihoon Jung --- src/ClientChannel.cpp | 30 +++++++++++++++++++---------- src/Reader.cpp | 18 ++++++++++++------ src/SEService.cpp | 44 +++++++++++++++++++++++++++---------------- src/Session.cpp | 42 +++++++++++++++++++++++++++-------------- 4 files changed, 88 insertions(+), 46 deletions(-) diff --git a/src/ClientChannel.cpp b/src/ClientChannel.cpp index 0d905d8..ba4673f 100755 --- a/src/ClientChannel.cpp +++ b/src/ClientChannel.cpp @@ -67,8 +67,10 @@ namespace smartcard_service_api NULL, &error); if (proxy == NULL) { - _ERR("Can not create proxy : %s", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("Can not create proxy : %s", error->message); + g_error_free(error); + } return; } } @@ -106,8 +108,10 @@ namespace smartcard_service_api _ERR("smartcard_service_channel_call_transmit failed, [%d]", result); } } else { - _ERR("smartcard_service_channel_call_transmit failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_channel_call_transmit failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } @@ -149,8 +153,10 @@ namespace smartcard_service_api _ERR("smartcard_service_channel_call_close_channel failed, [%d]", result); } } else { - _ERR("smartcard_service_channel_call_close_channel failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_channel_call_close_channel failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } @@ -188,8 +194,10 @@ namespace smartcard_service_api THROW_ERROR(ret); } } else { - _ERR("smartcard_service_channel_call_close_channel_sync failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_channel_call_close_channel_sync failed, [%s]", error->message); + g_error_free(error); + } throw ErrorIO(SCARD_ERROR_IPC_FAILED); } @@ -249,8 +257,10 @@ namespace smartcard_service_api THROW_ERROR(rv); } } else { - _ERR("smartcard_service_session_call_transmit failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_transmit failed, [%s]", error->message); + g_error_free(error); + } throw ErrorIO(SCARD_ERROR_IPC_FAILED); } diff --git a/src/Reader.cpp b/src/Reader.cpp index e91f301..b4d0ddc 100755 --- a/src/Reader.cpp +++ b/src/Reader.cpp @@ -57,8 +57,10 @@ namespace smartcard_service_api NULL, &error); if (proxy == NULL) { - _ERR("Can not create proxy : %s", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("Can not create proxy : %s", error->message); + g_error_free(error); + } return; } @@ -122,8 +124,10 @@ namespace smartcard_service_api THROW_ERROR(result); } } else { - _ERR("smartcard_service_reader_call_open_session_sync failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_reader_call_open_session_sync failed, [%s]", error->message); + g_error_free(error); + } THROW_ERROR(SCARD_ERROR_IPC_FAILED); } @@ -174,8 +178,10 @@ namespace smartcard_service_api _ERR("smartcard_service_reader_call_open_session failed, [%d]", result); } } else { - _ERR("smartcard_service_reader_call_open_session failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_reader_call_open_session failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } diff --git a/src/SEService.cpp b/src/SEService.cpp index 71450d1..bdd951d 100644 --- a/src/SEService.cpp +++ b/src/SEService.cpp @@ -167,8 +167,10 @@ namespace smartcard_service_api _ERR("smartcard_service_se_service_call_shutdown failed, [%d]", result); } } else { - _ERR("smartcard_service_se_service_call_shutdown failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_se_service_call_shutdown failed, [%s]", error->message); + g_error_free(error); + } } } @@ -195,8 +197,10 @@ namespace smartcard_service_api service->parseReaderInformation(readers); } } else { - _ERR("smartcard_service_se_service_call_se_service failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_se_service_call_se_service failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } @@ -237,9 +241,10 @@ namespace smartcard_service_api &result, NULL, &error) == false) { - _ERR("smartcard_service_se_service_call_shutdown_sync failed, [%s]", error->message); - - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_se_service_call_shutdown_sync failed, [%s]", error->message); + g_error_free(error); + } } /* wait at least 500ms */ @@ -265,8 +270,10 @@ namespace smartcard_service_api NULL, &error); if (proxy == NULL) { - _ERR("Can not create proxy : %s", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("Can not create proxy : %s", error->message); + g_error_free(error); + } return false; } @@ -307,8 +314,10 @@ namespace smartcard_service_api NULL, &error); if (proxy == NULL) { - _ERR("Can not create proxy : %s", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("Can not create proxy : %s", error->message); + g_error_free(error); + } return false; } @@ -365,8 +374,10 @@ namespace smartcard_service_api NULL, &error); if (proxy == NULL) { - _ERR("Can not create proxy : %s", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("Can not create proxy : %s", error->message); + g_error_free(error); + } return false; } @@ -387,9 +398,10 @@ namespace smartcard_service_api throw ExceptionBase(result); } } else { - _ERR("smartcard_service_se_service_call_se_service failed, [%s]", error->message); - g_error_free(error); - + if (error != NULL) { + _ERR("smartcard_service_se_service_call_se_service failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } diff --git a/src/Session.cpp b/src/Session.cpp index a600e1d..d14f59d 100755 --- a/src/Session.cpp +++ b/src/Session.cpp @@ -62,8 +62,10 @@ namespace smartcard_service_api NULL, &error); if (proxy == NULL) { - _ERR("Can not create proxy : %s", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("Can not create proxy : %s", error->message); + g_error_free(error); + } return; } @@ -126,8 +128,10 @@ namespace smartcard_service_api _ERR("smartcard_service_session_call_get_atr failed, [%d]", result); } } else { - _ERR("smartcard_service_session_call_get_atr failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_get_atr failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } @@ -188,8 +192,10 @@ namespace smartcard_service_api _ERR("smartcard_service_session_call_open_channel failed, [%d]", result); } } else { - _ERR("smartcard_service_session_call_open_channel failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_open_channel failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } @@ -229,8 +235,10 @@ namespace smartcard_service_api _ERR("smartcard_service_session_call_close_session failed, [%d]", result); } } else { - _ERR("smartcard_service_session_call_close_session failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_close_session failed, [%s]", error->message); + g_error_free(error); + } result = SCARD_ERROR_IPC_FAILED; } @@ -268,8 +276,10 @@ namespace smartcard_service_api THROW_ERROR(ret); } } else { - _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message); + g_error_free(error); + } THROW_ERROR(SCARD_ERROR_IPC_FAILED); } @@ -341,8 +351,10 @@ namespace smartcard_service_api THROW_ERROR(ret); } } else { - _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_get_atr_sync failed, [%s]", error->message); + g_error_free(error); + } THROW_ERROR(SCARD_ERROR_IPC_FAILED); } @@ -434,8 +446,10 @@ namespace smartcard_service_api THROW_ERROR(ret); } } else { - _ERR("smartcard_service_session_call_open_channel_sync failed, [%s]", error->message); - g_error_free(error); + if (error != NULL) { + _ERR("smartcard_service_session_call_open_channel_sync failed, [%s]", error->message); + g_error_free(error); + } THROW_ERROR(SCARD_ERROR_IPC_FAILED); } -- 2.34.1