mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xwayland: Check return of xcb_get_property_reply() before deref

Browse Source 
The man pages indicate this routine can return NULL on certain error
conditions.

Suggested by Marek Chalupa

Signed-off-by: Bryce Harrington <bryce@osg.samsung.com>
Reviewed-by: Marek Chalupa <mchqwerty@gmail.com>
This commit is contained in:
Bryce Harrington 2015-07-09 21:30:16 -07:00
parent cf7d95a688
commit b2d79d504e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xwayland/selection.c
View File

@ -111,6 +111,8 @@ weston_wm_get_incr_chunk(struct weston_wm *wm)
0x1fffffff /* length */); 0x1fffffff /* length */);
reply = xcb_get_property_reply(wm->conn, cookie, NULL); reply = xcb_get_property_reply(wm->conn, cookie, NULL);
if (reply == NULL)
return;
dump_property(wm, wm->atom.wl_selection, reply); dump_property(wm, wm->atom.wl_selection, reply);
@ -184,6 +186,8 @@ weston_wm_get_selection_targets(struct weston_wm *wm)
4096 /* length */); 4096 /* length */);
reply = xcb_get_property_reply(wm->conn, cookie, NULL); reply = xcb_get_property_reply(wm->conn, cookie, NULL);
if (reply == NULL)
return;
dump_property(wm, wm->atom.wl_selection, reply); dump_property(wm, wm->atom.wl_selection, reply);
@ -236,6 +240,8 @@ weston_wm_get_selection_data(struct weston_wm *wm)
0x1fffffff /* length */); 0x1fffffff /* length */);
reply = xcb_get_property_reply(wm->conn, cookie, NULL); reply = xcb_get_property_reply(wm->conn, cookie, NULL);
if (reply == NULL)
return;
if (reply->type == wm->atom.incr) { if (reply->type == wm->atom.incr) {
dump_property(wm, wm->atom.wl_selection, reply); dump_property(wm, wm->atom.wl_selection, reply);