emuld: fix some defects

close file pointer.
change strcat to strncat

Change-Id: Ie1e7e698f6ab619a783b7570d52b0a2aa232166f
Signed-off-by: ChulHo Song <ch81.song@samsung.com>

diff --git a/src/common.cpp b/src/common.cpp
index d19c68649c98fd07654a63c155530c7f80de6b2c..af7cfa58d2c956899bfd6d53472e67b3d8ef16fe 100644 (file)
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -383,7 +383,8 @@ static bool do_package(int action, char* data)
         strcat(pkg_list, " ");
         if (action == 2) {
             strcat(pkg_list, PATH_PACKAGE_INSTALL);
-            strcat(pkg_list, addon);
+            remain = MAX_PKGS_BUF - strnlen(pkg_list, MAX_PKGS_BUF) - strlen("/");
+            strncat(pkg_list, addon, remain - 1); // terminating null byte
             strcat(pkg_list, "/");
         }
 

diff --git a/src/net.cpp b/src/net.cpp
index 6723a96ff8f8a8e292a984b05fc45441f6d0eb47..aae348c70c07a023acc7e172586b496e32255712 100644 (file)
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -381,6 +381,7 @@ static int get_network_info(char str[], int str_size)
     if (!line)
     {
         LOGERR("failed to read /proc/cmdline");
+        fclose(fp);
         return -1;
     }