fix memory leaks

Change-Id: I808e89d36e738b5c63682c850baff857ba675b2a

diff --git a/common/cal_time.cpp b/common/cal_time.cpp
index af7307b..8022552 100644 (file)
--- a/common/cal_time.cpp
+++ b/common/cal_time.cpp
@@ -465,7 +465,7 @@ int _get_dst_savings(char *tzid)
 bool cal_time_is_dst_savings(void)
 {
        char buf[128] = {0};
-       ssize_t len = readlink("/opt/etc/localtime", buf, sizeof(buf) -1);
+       readlink("/opt/etc/localtime", buf, sizeof(buf) - 1);
 
        char *timezone = buf + 20; /* /usr/share/zoneinfo/ */
        return _get_dst_savings(timezone) == 0 ? false : true;

diff --git a/server/db/cal_db_plugin_search.c b/server/db/cal_db_plugin_search.c
index 5bb5a3b..fb722a5 100644 (file)
--- a/server/db/cal_db_plugin_search.c
+++ b/server/db/cal_db_plugin_search.c
@@ -90,12 +90,16 @@ static int _cal_db_search_get_records_with_query(calendar_query_h query, int off
                ret = cal_db_query_create_projection(query, &projection);
                if (CALENDAR_ERROR_NONE != ret) {
                        ERR("cal_db_query_create_projection() Fail(%d)", ret);
+                       g_slist_free_full(bind_text, free);
+                       CAL_FREE(condition);
                        return ret;
                }
        } else {
                ret = _cal_db_search_make_projection(query, &projection);
                if (CALENDAR_ERROR_NONE != ret) {
                        ERR("_cal_db_search_make_projection() Fail(%d)", ret);
+                       g_slist_free_full(bind_text, free);
+                       CAL_FREE(condition);
                        return ret;
                }
        }