Initialize memeber variables

Change-Id: I34521673acf4a6b2ec7cb0be99229cf50eb4f920

diff --git a/src/asp-advert.cpp b/src/asp-advert.cpp
index 6671b74c7fb098dc59b412cc629c7ba56a7f458e..d972272c9fb87f95417dbbe9abdd97e1f2aeba73 100644 (file)
--- a/src/asp-advert.cpp
+++ b/src/asp-advert.cpp
@@ -10,15 +10,21 @@ static __thread GList *asp_adverts = NULL;
 
 AspAdvert::AspAdvert()
 {
+       adv_id = (uintptr_t)this & 0xffffffff;
+       search_id = 0;
        auto_accept = 0;
-       config_method = 1;
+       discovery_tech = 0;
+       preferred_connection = 0;
+
        status = 0;
        role = 1;
-       service_info_map = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-       adv_id = (uintptr_t)this & 0xffffffff;
+       config_method = 1;
+       tran_id = 0;
+
        instance_name = NULL;
        serivce_name = NULL;
        service_type = NULL;
+       service_info_map = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
        rsp_info = NULL;
 }
 

diff --git a/src/asp-client.cpp b/src/asp-client.cpp
index 4d38c851d19887fbeba52fef6c45290175494abb..c8a7c28e2c4e5217d0ed8cb6452d1a1c45bb8568 100755 (executable)
--- a/src/asp-client.cpp
+++ b/src/asp-client.cpp
@@ -967,7 +967,7 @@ int asp_advert_create(char *instance_name, asp_advert_service_h *adv_service)
                service->instance_name = g_strdup(instance_name);
                if (!service->instance_name) {
                        ASP_LOGE("malloc() failed!!!.");
-                       g_free(service);
+                       delete service;
                        __ASP_LOG_FUNC_END__;
                        return ASP_ERROR_OUT_OF_MEMORY;
                }
@@ -1650,7 +1650,7 @@ int asp_seek_create(char *service_type, asp_seek_service_h *seek_service)
        service->service_type = g_strdup(service_type);
        if (!service->service_type) {
                ASP_LOGE("malloc() failed!!!.");
-               g_free(service);
+               delete service;
                __ASP_LOG_FUNC_END__;
                return ASP_ERROR_OUT_OF_MEMORY;
        }

diff --git a/src/asp-seek.cpp b/src/asp-seek.cpp
index a035ad40c06d9fc44c058c34bacffd6bafffbf58..ca66a97bef53a73b0a75c76d7d2efd53c5a78e06 100644 (file)
--- a/src/asp-seek.cpp
+++ b/src/asp-seek.cpp
@@ -5,10 +5,21 @@ static __thread GList *asp_seeks = NULL;
 
 AspSeek::AspSeek()
 {
+       adv_id = 0;
+       search_id = 0;
+       auto_accept = 0;
+       discovery_tech = 0;
+       preferred_connection = 0;
+
+       status = 0;
+       role = 0;
+       config_method = 0;
+       tran_id = 0;
+
        service_name = NULL;
        service_type = NULL;
-       rsp_info = NULL;
        service_info_map = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
+       rsp_info = NULL;
 }
 
 AspSeek::~AspSeek()
@@ -86,4 +97,4 @@ void addSeekToServiceList(AspSeek *service)
 void removeSeekFromServiceList(AspSeek *service)
 {
        asp_seeks = g_list_remove(asp_seeks, service);
-}
\ No newline at end of file
+}