RDK-52204: fixed the crashed issue dueto double free() while stopping

Signed-off-by: yuvaramachandran_gurusamy <[email protected]>

Author: yuvaramachandran-gurusamy

server/gdial-app.c

@@ -172,7 +172,6 @@ static void gdial_app_class_init (GDialAppClass *klass) {
             G_TYPE_NONE, 1, /* return type, arg num */
             G_TYPE_POINTER); /* arg types */
 
-  gdial_plat_init(g_main_context_default());
   gdial_plat_application_set_state_cb(gdial_plat_app_state_cb, NULL);
 }
 
@@ -343,6 +342,7 @@ void gdial_app_set_additional_dial_data(GDialApp *app, GHashTable *additional_di
     gdial_app_write_additional_dial_data(app->name, query_str, length);
   }
   g_free(query_str);
+  query_str = NULL;
 }
 
 GHashTable *gdial_app_get_additional_dial_data(GDialApp *app) {
@@ -368,9 +368,13 @@ void gdial_app_refresh_additional_dial_data(GDialApp *app) {
       /* we are ready to convert to hashtable*/
       gdial_util_str_str_hashtable_from_string(data, length, priv->additional_dial_data);
       GDIAL_LOGINFO("gdial_app_refresh_additional_dial_data [%s]", data);
-      g_free(data);
     }
   }
+  if (data) {
+    g_free(data);
+    data = NULL;
+  }
+
   GDIAL_LOGTRACE("Exiting ...");
 }
 
@@ -428,6 +432,7 @@ GDIAL_STATIC gboolean gdial_app_write_additional_dial_data(const gchar *app_name
   }
   g_object_unref(gfile);
   g_free(filename);
+  filename = NULL;
 
   return result;
 }
@@ -473,6 +478,7 @@ GDIAL_STATIC gboolean gdial_app_read_additional_dial_data(const gchar *app_name,
 
   g_object_unref(gfile);
   g_free(filename);
+  filename = NULL;
 
   GDIAL_LOGTRACE("Exiting ...");
 
@@ -494,6 +500,7 @@ GDIAL_STATIC gboolean gdial_app_remove_additional_dial_data_file(const gchar *ap
   }
   g_object_unref(gfile);
   g_free(filename);
+  filename = NULL;
 
   return result;
 }

server/gdial-rest.c

@@ -76,7 +76,7 @@ static gboolean gdial_soup_message_security_check(SoupMessage *msg) {
 }
 
 static void gdial_soup_message_set_http_error(SoupMessage *msg, guint state_code) {
-  GDIAL_LOGERROR("%s::uri=%s::state_code=%d", __FUNCTION__, soup_uri_get_path(soup_message_get_uri(msg)), state_code);
+  GDIAL_LOGERROR("uri[%s] state_code[%d]", soup_uri_get_path(soup_message_get_uri(msg)), state_code);
   soup_message_headers_replace(msg->response_headers, "Connection", "close");
   soup_message_set_status(msg, state_code);
   return;
@@ -931,7 +931,10 @@ static void gdial_rest_http_server_apps_callback(SoupServer *server,
 static void gdial_rest_server_dispose(GObject *object) {
   GDialRestServerPrivate *priv = gdial_rest_server_get_instance_private(GDIAL_REST_SERVER(object));
   soup_server_remove_handler(priv->soup_instance, GDIAL_REST_HTTP_APPS_URI);
-  if(GDIAL_REST_HTTP_APPS_URI) g_free(GDIAL_REST_HTTP_APPS_URI);
+  if(GDIAL_REST_HTTP_APPS_URI) {
+    g_free(GDIAL_REST_HTTP_APPS_URI);
+    GDIAL_REST_HTTP_APPS_URI = NULL;
+  }
   g_object_unref(priv->soup_instance);
   g_object_unref(priv->local_soup_instance);
   while (priv->registered_apps) {

server/gdial-shield.c

@@ -34,6 +34,7 @@ static GHashTable *active_conns_ = NULL;
 
 static void soup_message_weak_ref_callback(gpointer user_data, GObject *obj);
 static void server_request_remove_callback (SoupMessage *msg) {
+  GDIAL_LOGTRACE("Entering ...");
   DialShieldConnectionContext * conn_context = (DialShieldConnectionContext *) g_hash_table_lookup(active_conns_, msg);
   if (conn_context) {
     if (conn_context->read_timeout_source != 0) {
@@ -43,51 +44,64 @@ static void server_request_remove_callback (SoupMessage *msg) {
     }
     g_hash_table_remove(active_conns_, msg);
     g_free(conn_context);
+    conn_context = NULL;
   }
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 static gboolean soup_message_read_timeout_callback(gpointer user_data) {
   SoupMessage *msg = (SoupMessage*)user_data;
+  GDIAL_LOGTRACE("Entering ...");
   DialShieldConnectionContext * conn_context = (DialShieldConnectionContext *)g_hash_table_lookup(active_conns_, msg);
   g_print_with_timestamp("soup_message_read_timeout_callback tid=[%lx] msg=%p", pthread_self(), msg);
   if (conn_context) {
     conn_context->read_timeout_source = 0;
     g_socket_close(conn_context->read_gsocket, NULL);//this will trigger abort callback
   }
+  GDIAL_LOGTRACE("Exiting ...");
   return G_SOURCE_REMOVE;;
 }
 
 
 static void server_request_read_callback (SoupServer *server, SoupMessage *msg,
     SoupClientContext *context, gpointer data) {
+  GDIAL_LOGTRACE("Entering ...");
   g_print_with_timestamp("server_request_read_callback tid=[%lx] msg=%p", pthread_self(), msg);
   g_object_weak_unref(G_OBJECT(msg), (GWeakNotify)soup_message_weak_ref_callback, msg);
   server_request_remove_callback(msg);
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 static void server_request_finished_callback (SoupServer *server, SoupMessage *msg,
     SoupClientContext *context, gpointer data) {
+    GDIAL_LOGTRACE("!!!");
 }
 
 static void server_request_aborted_callback (SoupServer *server, SoupMessage *msg,
     SoupClientContext *context, gpointer data) {
+  GDIAL_LOGTRACE("Entering ...");
   g_print_with_timestamp("server_request_aborted_callback tid=[%lx] msg=%p", pthread_self(), msg);
+
   g_object_weak_unref(G_OBJECT(msg), (GWeakNotify)soup_message_weak_ref_callback, msg);
   server_request_remove_callback(msg);
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 static void soup_message_weak_ref_callback(gpointer user_data, GObject *obj) {
   SoupMessage *msg0=(SoupMessage*)obj;
   SoupMessage *msg=(SoupMessage*)user_data;
+  GDIAL_LOGTRACE("Entering ...");
   assert(msg0==msg);
   g_print_with_timestamp("soup_message_weak_ref_callback tid=[%lx] msg=%p", pthread_self(), msg);
   server_request_remove_callback(msg);
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 static void server_request_started_callback (SoupServer *server, SoupMessage *msg,
     SoupClientContext *context, gpointer data) {
 
   static const int throttle = GDIAL_THROTTLE_DELAY_US;
+  GDIAL_LOGTRACE("Entering ...");
   DialShieldConnectionContext *conn_context = g_new(DialShieldConnectionContext, 1);
   guint read_timeout_source = g_timeout_add(2000, (GSourceFunc)soup_message_read_timeout_callback, msg);
   conn_context->read_gsocket = soup_client_context_get_gsocket(context);
@@ -97,23 +111,30 @@ static void server_request_started_callback (SoupServer *server, SoupMessage *ms
   g_hash_table_insert(active_conns_, msg, conn_context);
   g_object_weak_ref(G_OBJECT(msg), (GWeakNotify)soup_message_weak_ref_callback, msg);
   usleep(throttle);
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 void gdial_shield_init(void) {
+  GDIAL_LOGTRACE("Entering ...");
   active_conns_ = g_hash_table_new(g_direct_hash, g_direct_equal);
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 void gdial_shield_server(SoupServer *server) {
   g_return_if_fail(server != NULL);
+  GDIAL_LOGTRACE("Entering ...");
   g_signal_connect(server, "request_started", G_CALLBACK(server_request_started_callback),  NULL);
   g_signal_connect(server, "request_read",    G_CALLBACK(server_request_read_callback),     NULL);
   g_signal_connect(server, "request_finished",G_CALLBACK(server_request_finished_callback), NULL);
   g_signal_connect(server, "request_aborted", G_CALLBACK(server_request_aborted_callback),  NULL);
+  GDIAL_LOGTRACE("Exiting ...");
 }
 
 void gdial_shield_term(void) {
   GHashTableIter iter;
   gpointer key, value;
+  GDIAL_LOGTRACE("Entering ...");
+  g_return_if_fail(active_conns_ != NULL);
   GDIAL_LOGINFO("gdial_shield_term: hash_table_size start= %d", g_hash_table_size(active_conns_));
   g_hash_table_iter_init(&iter, (GHashTable *)active_conns_);
   while (g_hash_table_iter_next(&iter, &key, &value)) {
@@ -123,4 +144,5 @@ void gdial_shield_term(void) {
   GDIAL_LOGINFO("gdial_shield_term: hash_table_size end= %d", g_hash_table_size(active_conns_));
   g_hash_table_unref(active_conns_);
   active_conns_ = NULL;
+  GDIAL_LOGTRACE("Exiting ...");
 }

server/gdial-ssdp.c

@@ -107,6 +107,7 @@ static void ssdp_http_server_callback(SoupServer *server, SoupMessage *msg, cons
   gchar *application_url_str = g_strdup_printf("http://%s:%d/%s/", iface_ipv4_address, GDIAL_REST_HTTP_PORT,app_random_uuid);
   soup_message_headers_replace (msg->response_headers, "Application-URL", application_url_str);
   g_free(application_url_str);
+  application_url_str = NULL;
   soup_message_set_response(msg, "text/xml; charset=utf-8", SOUP_MEMORY_STATIC, dd_xml_response_str_, dd_xml_response_str_len);
   soup_message_set_status(msg, SOUP_STATUS_OK);
   GDIAL_CHECK("Content-Type:text/xml");
@@ -121,6 +122,7 @@ void gdial_ssdp_networkstandbymode_handler(const bool nwstandby)
         gchar *dial_ssdp_WAKEUP = g_strdup_printf(DIAL_SSDP_WAKEUP_FMT,gdial_plat_util_get_iface_mac_addr(gdial_options_->iface_name),MAX_POWERON_TIME);
         gssdp_client_append_header(ssdp_client_, "WAKEUP", dial_ssdp_WAKEUP);
         g_free(dial_ssdp_WAKEUP);
+        dial_ssdp_WAKEUP = NULL;
      }
      else{
         GDIAL_LOGINFO("gdial_ssdp_networkstandbymode_handler remove WAKEUP header  ");
@@ -137,6 +139,8 @@ int gdial_ssdp_new(SoupServer *ssdp_http_server, GDialOptions *options, const gc
   g_return_val_if_fail(options->iface_name != NULL, -1);
 
   gdial_options_ = options;
+  GDIAL_LOGINFO("gdial_options_->friendly_name[%p]",gdial_options_->friendly_name);
+
   if (gdial_options_->friendly_name == NULL) gdial_options_->friendly_name = g_strdup(GDIAL_SSDP_FRIENDLY_DEFAULT);
   if (gdial_options_->manufacturer== NULL) gdial_options_->manufacturer = g_strdup(GDIAL_SSDP_MANUFACTURER_DEFAULT);
   if (gdial_options_->model_name== NULL) gdial_options_->model_name = g_strdup(GDIAL_SSDP_MODELNAME_DEFAULT);
@@ -177,6 +181,7 @@ int gdial_ssdp_new(SoupServer *ssdp_http_server, GDialOptions *options, const gc
     gchar *dial_ssdp_WAKEUP = g_strdup_printf(DIAL_SSDP_WAKEUP_FMT,gdial_plat_util_get_iface_mac_addr(gdial_options_->iface_name),MAX_POWERON_TIME);
     gssdp_client_append_header(ssdp_client, "WAKEUP", dial_ssdp_WAKEUP);
     g_free(dial_ssdp_WAKEUP);
+    dial_ssdp_WAKEUP = NULL;
   }
   else {
     GDIAL_LOGINFO("WOL Wake feature is disabled");
@@ -192,7 +197,9 @@ int gdial_ssdp_new(SoupServer *ssdp_http_server, GDialOptions *options, const gc
     gssdp_resource_group_add_resource_simple (ssdp_resource_group, dial_ssdp_ST_target, dial_ssdp_USN, dial_ssdp_LOCATION);
   gssdp_resource_group_set_available (ssdp_resource_group, FALSE);
   g_free(dial_ssdp_USN);
+  dial_ssdp_USN = NULL;
   g_free(dial_ssdp_LOCATION);
+  dial_ssdp_LOCATION = NULL;
 
   ssdp_resource_group_ = ssdp_resource_group;
 
@@ -207,23 +214,66 @@ int gdial_ssdp_new(SoupServer *ssdp_http_server, GDialOptions *options, const gc
 }
 
 int gdial_ssdp_destroy() {
-  soup_server_remove_handler(ssdp_http_server_, "/dd.xml");
-  gssdp_resource_group_remove_resource(ssdp_resource_group_, ssdp_resource_id_);
-
-  if (dd_xml_response_str_) {
-    g_free(dd_xml_response_str_);
+  GDIAL_LOGTRACE("Entering ...");
+  if (ssdp_http_server_)
+  {
+    soup_server_remove_handler(ssdp_http_server_, "/dd.xml");
   }
-  if (gdial_options_->friendly_name != NULL) g_free(gdial_options_->friendly_name);
-  if (gdial_options_->uuid != NULL) g_free(gdial_options_->uuid);
-  if (gdial_options_->iface_name != NULL) g_free(gdial_options_->iface_name);
-  if (app_random_uuid) g_free(app_random_uuid);
-
-  gssdp_client_clear_headers(ssdp_client_);
 
-  g_object_unref(ssdp_http_server_);
-  g_object_unref(ssdp_resource_group_);
-  g_object_unref(ssdp_client_);
+  if (ssdp_resource_group_)
+  {
+    gssdp_resource_group_remove_resource(ssdp_resource_group_, ssdp_resource_id_);
+    ssdp_resource_id_ = 0;
+  }
 
+  if (dd_xml_response_str_)
+  {
+    g_free(dd_xml_response_str_);
+    dd_xml_response_str_ = NULL;
+  }
+  if (gdial_options_)
+  {
+    if (gdial_options_->friendly_name != NULL)
+    {
+        g_free(gdial_options_->friendly_name);
+        gdial_options_->friendly_name = NULL;
+    }
+    if (gdial_options_->uuid != NULL)
+    {
+        g_free(gdial_options_->uuid);
+        gdial_options_->uuid = NULL;
+    }
+    if (gdial_options_->iface_name != NULL)
+    {
+        g_free(gdial_options_->iface_name);
+        gdial_options_->iface_name = NULL;
+    }
+    gdial_options_ = NULL;
+  }
+  if (app_random_uuid != NULL) {
+    g_free(app_random_uuid);
+    app_random_uuid = NULL;
+  }
+  if (ssdp_client_)
+  {
+    gssdp_client_clear_headers(ssdp_client_);
+  }
+  if (ssdp_http_server_)
+  {
+    g_object_unref(ssdp_http_server_);
+    ssdp_http_server_ = NULL;
+  }
+  if (ssdp_resource_group_)
+  {
+    g_object_unref(ssdp_resource_group_);
+    ssdp_resource_group_ = NULL;
+  }
+  if (ssdp_client_)
+  {
+    g_object_unref(ssdp_client_);
+    ssdp_client_ = NULL;
+  }
+  GDIAL_LOGTRACE("Exiting ...");
   return 0;
 }
 

server/gdialserver_ut.cpp

@@ -181,7 +181,7 @@ class gdialServiceTest: public GDialNotifier
             GDIAL_LOGINFO("App:%s  appID:%s",appName.c_str(),appID.c_str());
         }
 
-        virtual void onDisconnect() override
+        virtual void onStopped() override
         {
             GDIAL_LOGINFO("~~~~~~~~~~~");
         }
@@ -224,7 +224,16 @@ int main(int argc, char *argv[])
             break;
         }
 
-        if (input == "enable") {
+        if (input == "restart") {
+            GDIAL_LOGINFO("Restarting");
+            if (nullptr != testObject)
+            {
+                delete testObject;
+                testObject = nullptr;
+            }
+            testObject = new gdialServiceTest(gdial_args);
+        }
+        else if (input == "enable") {
             GDIAL_LOGINFO("Activation enabled");
             testObject->ActivationChanged(true);
         }