From ed9eba3b4dbe891c329a4669bf7dff5a7d861eac Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Thu, 22 Sep 2016 12:04:32 +0900 Subject: [PATCH] Fix Svace issue Signed-off-by: Jihoon Jung Change-Id: I92fa8349ab3ffb9b7246416dc4e565c296fb3b3c --- src/oem/oem_emul.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/src/oem/oem_emul.c b/src/oem/oem_emul.c index 22612d0..0bd94a9 100644 --- a/src/oem/oem_emul.c +++ b/src/oem/oem_emul.c @@ -513,20 +513,21 @@ static void _net_nfc_deinitialize_llcp(void) { DEBUG_EMUL_BEGIN(); - if (Snep_Server_msg->data->buffer != NULL) + if (Snep_Server_msg != NULL) { - free(Snep_Server_msg->data->buffer); - Snep_Server_msg->data->buffer = NULL; - } + if (Snep_Server_msg->data != NULL) + { - if (Snep_Server_msg->data != NULL) - { - free(Snep_Server_msg->data); - Snep_Server_msg->data = NULL; - } + if (Snep_Server_msg->data->buffer != NULL) + { + free(Snep_Server_msg->data->buffer); + Snep_Server_msg->data->buffer = NULL; + } + + free(Snep_Server_msg->data); + Snep_Server_msg->data = NULL; + } - if(Snep_Server_msg != NULL) - { free(Snep_Server_msg); Snep_Server_msg = NULL; } @@ -1655,11 +1656,15 @@ static void emul_ReaderThread(void * pArg) if((emulMsg_poll_fd = epoll_create1(EPOLL_CLOEXEC)) == -1) { DEBUG_MSG("epoll_create1 is occured"); + close(emulMsg_file_fd); + return; } if((emulMsg_poll_events = (struct epoll_event *)calloc(1, sizeof(struct epoll_event) * EPOLL_SIZE)) == NULL) { DEBUG_MSG("calloc is occured"); + close(emulMsg_file_fd); + return; } /* set event */ -- 2.7.4