From 6755bdb7749818cec358acee929e443a28bd385a Mon Sep 17 00:00:00 2001 From: Yu Jiung Date: Fri, 2 Dec 2016 16:09:21 +0900 Subject: [PATCH] Fix Svace issues WGID 150343, 150344 Change-Id: I3c9a04eddcfde6d583a15518a37d74288df187e4 Signed-off-by: Yu jiung --- packaging/capi-vpn-service.spec | 2 +- src/capi_vpn_service.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/packaging/capi-vpn-service.spec b/packaging/capi-vpn-service.spec index 6b7afd4..addb2e8 100755 --- a/packaging/capi-vpn-service.spec +++ b/packaging/capi-vpn-service.spec @@ -1,6 +1,6 @@ Name: vpnsvc-pkg Summary: VPN service library in TIZEN C API -Version: 1.0.25 +Version: 1.0.26 Release: 1 Group: System/Network License: Apache-2.0 diff --git a/src/capi_vpn_service.c b/src/capi_vpn_service.c index 8a61c49..e2c3d2f 100755 --- a/src/capi_vpn_service.c +++ b/src/capi_vpn_service.c @@ -650,7 +650,7 @@ EXPORT_API int vpnsvc_read(vpnsvc_h handle, int timeout_ms) tv.tv_usec = timeout_ms*1000; retVal = select(tun_s->fd +1, &read_set, NULL, NULL, &tv); - if (retVal) { + if (retVal > 0) { LOGD("Data is available now.\n"); ret = VPNSVC_ERROR_NONE; } else if (retVal == 0) { @@ -789,11 +789,7 @@ EXPORT_API int vpnsvc_unblock_networks(vpnsvc_h handle) tun_s = (vpnsvc_tun_s*)handle; LOGD("enter vpnsvc_unblock_networks"); - - if (tun_s == NULL) { - LOGE("handle is a NULL"); //LCOV_EXCL_LINE - return VPNSVC_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE - } else if (tun_s->connection == NULL) { + if (tun_s->connection == NULL) { LOGE("Connection Object is NULL"); //LCOV_EXCL_LINE return VPNSVC_ERROR_INVALID_PARAMETER; //LCOV_EXCL_LINE } -- 2.7.4