From ce184035417e7cc649c22c7e175d3088bd1e5b22 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 29 Aug 2012 09:08:30 +0000 Subject: [PATCH] fix weird ecore-ipc leak SVN revision: 75822 --- legacy/ecore/ChangeLog | 4 ++++ legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c | 4 +--- legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/legacy/ecore/ChangeLog b/legacy/ecore/ChangeLog index d425d76f36..9d32f99029 100644 --- a/legacy/ecore/ChangeLog +++ b/legacy/ecore/ChangeLog @@ -879,3 +879,7 @@ 2012-08-29 Cedric Bail * Always call evas_render_update_free to prevent leak in Ecore_Evas X backend. + +2012-08-39 Mike Blumenkrantz + + * Fix leak in ecore_ipc servers diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c index 0cddad2227..9e655d30a4 100644 --- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c +++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc.c @@ -538,7 +538,7 @@ ecore_ipc_server_clients_get(Ecore_Ipc_Server *svr) "ecore_ipc_server_clients_get"); return NULL; } - return svr->client_list; + return svr->clients; } #define SVENC(_member) \ @@ -1044,7 +1044,6 @@ _ecore_ipc_event_client_add(void *data __UNUSED__, int ev_type __UNUSED__, void cl->max_buf_size = 32 * 1024; ecore_con_client_data_set(cl->client, (void *)cl); svr->clients = eina_list_append(svr->clients, cl); - svr->client_list = eina_list_append(svr->client_list, cl); if (!cl->delete_me) { Ecore_Ipc_Event_Client_Add *e2; @@ -1081,7 +1080,6 @@ _ecore_ipc_event_client_del(void *data __UNUSED__, int ev_type __UNUSED__, void { Ecore_Ipc_Event_Client_Del *e2; - svr->client_list = eina_list_remove(svr->client_list, cl); if (!cl->delete_me) { e2 = calloc(1, sizeof(Ecore_Ipc_Event_Client_Del)); diff --git a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h index bbf3d7b985..bedaab167c 100644 --- a/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h +++ b/legacy/ecore/src/lib/ecore_ipc/ecore_ipc_private.h @@ -89,7 +89,6 @@ struct _Ecore_Ipc_Server ECORE_MAGIC; Ecore_Con_Server *server; Eina_List *clients; - Eina_List *client_list; void *data; unsigned char *buf; int buf_size;