dev = info->data;
if (!dev) {
UAM_WARN("info->data is NULL");
- _uam_manager_remove_req_ctxt_from_list(info);
continue;
}
strcasecmp(dev->device_id, dev_info->device_id)) {
UAM_WARN("[%d != %d] || [%s != %s]", dev->type, dev_info->type,
dev->device_id, dev_info->device_id);
- _uam_manager_remove_req_ctxt_from_list(info);
continue;
}
out_param = g_array_new(FALSE, FALSE, sizeof(gchar));
g_array_append_vals(out_param, dev_info, sizeof(uam_device_info_s));
_uam_manager_method_return(info->context, out_param, status);
- g_free(info->data);
+
+ _uam_remove_timer(info->tid);
+
_uam_manager_remove_req_ctxt_from_list(info);
+
break;
}
GSList *next = l->next;
uam_request_context_t *info = l->data;
- if (NULL == info || NULL == info->sender)
+ if (NULL == info) {
+ request_list = g_slist_remove_link(request_list, l);
+ l = next;
continue;
+ }
+
+ if (NULL == info->sender) {
+ g_free(req_info->data);
+ g_free(req_info);
+ request_list = g_slist_remove_link(request_list, l);
+ l = next;
+ continue;
+ }
if ((strcasecmp(info->sender, req_info->sender) == 0) &&
req_info->function == info->function) {
g_free(req_info->sender);
+ g_free(req_info->data);
g_free(req_info);
request_list = g_slist_remove_link(request_list, l);