Fix resource leaks

Change-Id: I9b15df8b4f5873416eb6ec362ad56e60a74c7ed9
Signed-off-by: s414.kim <s414.kim@samsung.com>
Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

diff --git a/ode/src/interface/tools/vconf.cpp b/ode/src/interface/tools/vconf.cpp
index 2c1fe3bca14e0c0ceca46be9145a1d27c50113af..05af81e4c0bea00efa21d3a6f5b0539ba15077b4 100644 (file)
--- a/ode/src/interface/tools/vconf.cpp
+++ b/ode/src/interface/tools/vconf.cpp
@@ -18,6 +18,8 @@
 
 #include "vconf.h"
 
+#include <cstdlib>
+
 static void keyChangedCallback(keynode_t *node, void *data)
 {
        Vconf *vconf = reinterpret_cast<Vconf *>(data);
@@ -33,9 +35,12 @@ Vconf::~Vconf()
 {
 }
 
-char *Vconf::getString()
+std::string Vconf::getString()
 {
-       return ::vconf_get_str(vconfKey.c_str());
+       char *tmp = ::vconf_get_str(vconfKey.c_str());
+       std::string ret = (tmp != nullptr) ? std::string(tmp) : std::string();
+       ::free(tmp);
+       return ret;
 }
 
 int Vconf::getInt()

diff --git a/ode/src/interface/tools/vconf.h b/ode/src/interface/tools/vconf.h
index 680fcea12a3b3cc0697c2fa3fb5c526e181476ba..0e3b6140ff447862a9bacb9c6590edc739cad3c9 100644 (file)
--- a/ode/src/interface/tools/vconf.h
+++ b/ode/src/interface/tools/vconf.h
@@ -19,6 +19,8 @@
 #ifndef __ODE_VCONF_H__
 #define __ODE_VCONF_H__
 
+#include <string>
+
 #include <vconf.h>
 #include "../../widgets/signal.h"
 
@@ -27,7 +29,7 @@ public:
        Vconf(const std::string &key);
        ~Vconf();
 
-       char *getString();
+       std::string getString();
        int getInt();
        bool getBool();
 

diff --git a/secure-erase/src/ui.c b/secure-erase/src/ui.c
index 6cf2fa3327b60ddf66f11010bebd6293751d1c8b..f18b4057ec96df4a7b9b3274e41b8c616a56ba49 100644 (file)
--- a/secure-erase/src/ui.c
+++ b/secure-erase/src/ui.c
@@ -109,6 +109,7 @@ static Eina_Bool progressbar_timer_cb(void *data)
        progress = vconf_get_str(VCONFKEY_ODE_ERASE_PROGRESS);
        if (progress) {
                percentage = atoi(progress);
+               free(progress);
        } else {
                delete_notification(ud->notification);
                ui_app_exit();