Fix Svace issue : 150354, 150355

Signed-off-by: Jihoon Jung <jh8801.jung@samsung.com>
Change-Id: I6a09b8a2adcf7e1ede0c1dd5257b70905be1100c

diff --git a/packaging/nfc-plugin-emul.spec b/packaging/nfc-plugin-emul.spec
index b606f95..c8baaa8 100644 (file)
--- a/packaging/nfc-plugin-emul.spec
+++ b/packaging/nfc-plugin-emul.spec
@@ -1,6 +1,6 @@
 Name:       nfc-plugin-emul
 Summary:    NFC emul plugin
-Version:    0.0.19
+Version:    0.0.20
 Release:    0
 Group:      TO_BE/FILLED_IN
 License:    Apache-2.0

diff --git a/src/oem/oem_emul.c b/src/oem/oem_emul.c
index 0bd94a9..69bd0e9 100644 (file)
--- a/src/oem/oem_emul.c
+++ b/src/oem/oem_emul.c
@@ -1692,15 +1692,8 @@ static void emul_ReaderThread(void * pArg)
                        condition = 0;
                }
 
-               while((num_of_files = epoll_wait(emulMsg_poll_fd, emulMsg_poll_events, EPOLL_SIZE, -1)) == 0){
-                       if(emulMsg_poll_fd == -1){
-                               DEBUG_MSG("client ipc thread is terminated");
-                               condition = 0;
-                       }
-                       else{
-                               DEBUG_MSG("no data is changed ");
-                       }
-
+               while((num_of_files = epoll_wait(emulMsg_poll_fd, emulMsg_poll_events, EPOLL_SIZE, -1)) == 0) {
+                       DEBUG_MSG("no data is changed ");
                }
 
                for(index = 0; index < num_of_files; index++)
@@ -2873,14 +2866,8 @@ static bool net_nfc_emul_controller_llcp_recv(net_nfc_target_handle_s* handle, n
                else {
                        /* In here, we dosen't call _net_nfc_llcp_data_receive_cb. just wait event from emulator */
                        /*After copying data address, we will return it, immediately */
-                       if(data != NULL) {
-                               DEBUG_MSG("data address is set");
-                               llcp_server_data = data;
-                       }
-                       else {
-                               DEBUG_ERR_MSG("data address is NULL");
-                               return false;
-                       }
+                       DEBUG_MSG("data address is set");
+                       llcp_server_data = data;
                }
        }
        else {