enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 6 Projects Releases Wiki Activity

ecore_x: NULL derefs. 

Reviewers: raster, devilhorns

Subscribers: raster, cedric, jpeg

Differential Revision: https://phab.enlightenment.org/D4018
This commit is contained in:
Benjamin Jacobs 2016-07-11 14:19:59 +09:00 committed by Carsten Haitzler (Rasterman)
parent 899d2d957a
commit e03d4142ef
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lib/ecore_x/xcb/ecore_xcb.c
View File

@ -504,9 +504,12 @@ ecore_x_client_message8_send(Ecore_X_Window win, Ecore_X_Atom type,
ev.format = 8;
ev.window = win;
ev.type = type;
if (len > 20) len = 20;
memcpy(ev.data.data8, data, len);
memset(ev.data.data8 + len, 0, 20 - len);
if (len > 20)
len = 20;
if (data && len > 0)
memcpy(ev.data.data8, data, len);
if (len < 20)
memset(ev.data.data8 + len, 0, 20 - len);
cookie = xcb_send_event(_ecore_xcb_conn, 0, win,
XCB_EVENT_MASK_NO_EVENT, (const char *)&ev);

3
src/lib/ecore_x/xlib/ecore_x.c
View File

@ -2124,7 +2124,8 @@ ecore_x_client_message8_send(Ecore_X_Window win,
if (len > 20)
len = 20;
memcpy(xev.xclient.data.b, data, len);
if (data && len > 0)
memcpy(xev.xclient.data.b, data, len);
if (len < 20)
memset(xev.xclient.data.b + len, 0, 20 - len);