summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYunmi Ha <yunmi.ha@samsung.com>2016-11-30 17:29:19 +0900
committerYunmi Ha <yunmi.ha@samsung.com>2016-11-30 17:30:18 +0900
commitd0a9faced7c354c3a85035d6e45586f5dd33ed21 (patch)
tree389dd4d146954a1a01dc78039a7b46a473feeece
parent79bb9f63d6ab3d55fffdefbe83a6f206923ed5d7 (diff)
parent3c49607ce6f0b22bacc04fa7efa5603bb2752513 (diff)
downloadtlm-d0a9faced7c354c3a85035d6e45586f5dd33ed21.tar.gz
tlm-d0a9faced7c354c3a85035d6e45586f5dd33ed21.tar.bz2
tlm-d0a9faced7c354c3a85035d6e45586f5dd33ed21.zip
Merge branch 'tizen_3.0' into tizen
Change-Id: I972ba1de0dd4f47d21577a3b2de4483d1ee2d0d3 Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>
-rwxr-xr-xsrc/common/tlm-utils.c6
-rwxr-xr-x[-rw-r--r--]src/utils/tlm-client.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/common/tlm-utils.c b/src/common/tlm-utils.c
index 22c3ea9..cc04208 100755
--- a/src/common/tlm-utils.c
+++ b/src/common/tlm-utils.c
@@ -61,7 +61,7 @@ g_clear_string (gchar **str)
gchar *
tlm_user_get_name (uid_t user_id)
{
- struct passwd *pwent;
+ struct passwd *pwent = NULL;
struct passwd buf_pwent;
gchar *buf = NULL, *tmp = NULL, *pw_name = NULL;
gsize size = sysconf(_SC_GETPW_R_SIZE_MAX);
@@ -162,7 +162,7 @@ tlm_user_get_gid (const gchar *username)
gchar *
tlm_user_get_home_dir (const gchar *username)
{
- struct passwd *pwent;
+ struct passwd *pwent = NULL;
struct passwd buf_pwent;
gchar *buf = NULL, *tmp = NULL, *pw_dir = NULL;
gsize size = sysconf(_SC_GETPW_R_SIZE_MAX);
@@ -197,7 +197,7 @@ tlm_user_get_home_dir (const gchar *username)
gchar *
tlm_user_get_shell (const gchar *username)
{
- struct passwd *pwent;
+ struct passwd *pwent = NULL;
struct passwd buf_pwent;
gchar *buf = NULL, *tmp = NULL, *pw_shell = NULL;
gsize size = sysconf(_SC_GETPW_R_SIZE_MAX);
diff --git a/src/utils/tlm-client.c b/src/utils/tlm-client.c
index 7551f61..1d07747 100644..100755
--- a/src/utils/tlm-client.c
+++ b/src/utils/tlm-client.c
@@ -94,7 +94,7 @@ _setup_daemon ()
if (env_val)
bin_path = env_val;
#endif
- if(!bin_path) {
+ if(!bin_path || strlen(bin_path) == 0) {
WARN("No TLM daemon bin path found");
return FALSE;
}