hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Right fix for alloc 

Actually we already checked that num != 0, but lacked num < 0 for one of
the allocs

SVN revision: 54205
This commit is contained in:
Sebastian Dransfeld 2010-11-06 01:22:29 +00:00
parent e289280418
commit 5fc5dcc215
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
legacy/ecore/src/lib/ecore_con/ecore_con.c
View File

@ -1781,10 +1781,7 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
if (lost_server)
_ecore_con_server_kill(svr);
if ((!num) || svr->delete_me)
return;
if ((num > 0) && (!svr->delete_me))
{
Ecore_Con_Event_Server_Data *e;
@ -1793,18 +1790,14 @@ _ecore_con_cl_read(Ecore_Con_Server *svr)
svr->event_count++;
e->server = svr;
e->data = NULL;
if (num > 0)
e->data = malloc(num);
if (!e->data)
{
e->data = malloc(num);
if (!e->data)
{
ERR("alloc!");
free(e);
return;
}
memcpy(e->data, buf, num);
ERR("alloc!");
free(e);
return;
}
memcpy(e->data, buf, num);
e->size = num;
ecore_event_add(ECORE_CON_EVENT_SERVER_DATA, e,
_ecore_con_event_server_data_free, NULL);
@ -2130,18 +2123,14 @@ _ecore_con_svr_cl_read(Ecore_Con_Client *cl)
cl->event_count++;
_ecore_con_cl_timer_update(cl);
e->client = cl;
e->data = NULL;
if (num > 0)
e->data = malloc(num);
if (!e->data)
{
e->data = malloc(num);
if (!e->data)
{
ERR("alloc!");
free(e);
return;
}
memcpy(e->data, buf, num);
ERR("alloc!");
free(e);
return;
}
memcpy(e->data, buf, num);
e->size = num;
ecore_event_add(ECORE_CON_EVENT_CLIENT_DATA, e,
_ecore_con_event_client_data_free, NULL);