[PATCH weston] Add a missing error check to weston_wm_handle_icon

[Pekka Paalanen]

On Sat, 17 Mar 2018 00:09:00 -0400
Dima Ryazanov <dima at gmail.com> wrote:

> This fixes a crash when launching Duke Nukem Forever.
> (Sorry, I wish I had a less ridiculous test case...)
> 
> Signed-off-by: Dima Ryazanov <dima at gmail.com>
> ---
>  xwayland/window-manager.c | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/xwayland/window-manager.c b/xwayland/window-manager.c
> index c307e199..e9c60c1e 100644
> --- a/xwayland/window-manager.c
> +++ b/xwayland/window-manager.c
> @@ -1368,6 +1368,9 @@ weston_wm_handle_icon(struct weston_wm *wm, struct weston_wm_window *window)
>  	                          wm->atom.net_wm_icon, XCB_ATOM_ANY, 0,
>  	                          UINT32_MAX);
>  	reply = xcb_get_property_reply(wm->conn, cookie, NULL);
> +	if (!reply)
> +		return;
> +
>  	length = xcb_get_property_value_length(reply);
>  
>  	/* This is in 32-bit words, not in bytes. */

Hi,

this looks like a good fix, but the code was just reverted due to
several other issues. I'm copying to Scott so that if he wants to
re-send the icon feature once we have passed the final release, he could
integrate this fix as well.


Thanks,
pq
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 833 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/wayland-devel/attachments/20180403/b4996905/attachment-0001.sig>