styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wl dnd - fix more use after free 

restructure code a bit to not fall into this trap as easily and remove
the falling into the trap where we use buf after freeing it.

fixes CID 1403924
This commit is contained in:
Carsten Haitzler 2019-08-06 17:54:40 +01:00
parent 3c7d93059b
commit 0a4f035fb6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/modules/xwayland/dnd.c
View File

@ -363,13 +363,9 @@ _xwl_pipe_read(void *data, Ecore_Fd_Handler *fdh)
unsigned char *buf;
buf = malloc(INCR_CHUNK_SIZE);
if (!buf) goto err;
len = read(ecore_main_fd_handler_fd_get(fdh), (void*)buf, INCR_CHUNK_SIZE);
if (len < 0)
{
free(buf);
_incr_update(p, 0);
eina_hash_del_by_key(pipes, &p->win);
}
if (len == INCR_CHUNK_SIZE)
{
p->buf = eina_binbuf_manage_new(buf, len, 0);
@ -386,22 +382,28 @@ _xwl_pipe_read(void *data, Ecore_Fd_Handler *fdh)
ecore_main_fd_handler_active_set(p->fdh, 0);
return ECORE_CALLBACK_RENEW;
}
if (len)
p->buf = eina_binbuf_manage_new(buf, len, 0);
else if (len > 0)
{
p->buf = eina_binbuf_manage_new(buf, len, 0);
}
else
{
_incr_update(p, 0);
eina_hash_del_by_key(pipes, &p->win);
free(buf);
return ECORE_CALLBACK_RENEW;
}
_incr_upload(p);
if (p->incr)
ecore_main_fd_handler_active_set(p->fdh, 0);
{
ecore_main_fd_handler_active_set(p->fdh, 0);
}
else
{
_incr_update(p, 1);
eina_hash_del_by_key(pipes, &p->win);
}
err:
return ECORE_CALLBACK_RENEW;
}