Merge branch 'tizen_5.5' into tizen

Change-Id: I6bb014c11434d41ff37edbcfc8a3d37e3abcd1a2

diff --git a/packaging/capi-ui-sticker.spec b/packaging/capi-ui-sticker.spec
index ee59659..ba3d59b 100644 (file)
--- a/packaging/capi-ui-sticker.spec
+++ b/packaging/capi-ui-sticker.spec
@@ -104,6 +104,7 @@ make %{?jobs:-j%jobs}
 
 %if 0%{?gcov:1}
 mkdir -p gcov-obj
+find . -name '*_dbus.c.gcno' -exec rm {} \;
 find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
 %endif
 

diff --git a/server/stickerd_data_manager.c b/server/stickerd_data_manager.c
index 4f0b5b2..c97f50c 100644 (file)
--- a/server/stickerd_data_manager.c
+++ b/server/stickerd_data_manager.c
@@ -441,7 +441,14 @@ static int _file_copy(const char *src, const char *dest)
 
     memset(buf, '\0', 4096);
     fd = open(src, O_RDONLY);
+    if (fd == -1) {
+        LOGE("Failed to open file (%s) for reading", src);
+    }
+
     n_fd = open(dest, O_WRONLY | O_CREAT | O_TRUNC, 0755);
+    if (n_fd == -1) {
+        LOGE("Failed to open file (%s) for writing", dest);
+    }
 
     if (fd == -1 || n_fd == -1) {
         tmp_err = errno;