[PATCH:libX11] If XGetImage fails to create image, don't dereference it to bounds check

2018-03-06 Thread Alan Coopersmith
Reported by gcc 7.3: GetImage.c:110:25: warning: potential null pointer dereference [-Wnull-dereference] if (planes < 1 || image->height < 1 || image->bytes_per_line < 1 || ~^~~~ Introduced by 8ea762f94f4c942d898fdeb590a1630c83235c17 in Xlib 1.6.4 Signed-off-by: Al

Re: [PATCH xserver] os/xdmcp: Don't create a new socket in XdmcpReset()

2018-03-06 Thread Alexander Volkov
26.02.2018 19:53, Alexander Volkov пишет: xdmcpSocket survives during the reset, there is no need to create a new one. This commit restores logic that was broken by 49c0f2413d32fdfe36e45861fcb32aaeab633094 in Xorg 1.19. Signed-off-by: Alexander Volkov --- os/xdmcp.c | 12 +--- 1 fil

Re: [PATCH xserver] glamor: Restore glamor_fd_from_pixmap and glamor_pixmap_from_fd

2018-03-06 Thread Adam Jackson
On Tue, 2018-03-06 at 10:34 +, Daniel Stone wrote: > Reviewed-by: Daniel Stone Merged, thanks: remote: I: patch #208182 updated using rev 43576b901151a1f32209f476249a4de6980b654f. remote: I: 1 patch(es) updated to state Accepted. To ssh://git.freedesktop.org/git/xorg/xserver 5d3fd3856b.

Re: [PATCH xserver] glamor: Restore glamor_fd_from_pixmap and glamor_pixmap_from_fd

2018-03-06 Thread Daniel Stone
Hi Michel, On 6 March 2018 at 09:53, Michel Dänzer wrote: > They're part of the 1.20 RC1 ABI, and actually used by external drivers. > Also, requiring drivers which don't support the new functionality in > DRI3 1.2 to switch to the new interfaces seems unreasonable. Thanks for this, and apologie

[PATCH xserver] glamor: Restore glamor_fd_from_pixmap and glamor_pixmap_from_fd

2018-03-06 Thread Michel Dänzer
From: Michel Dänzer They're part of the 1.20 RC1 ABI, and actually used by external drivers. Also, requiring drivers which don't support the new functionality in DRI3 1.2 to switch to the new interfaces seems unreasonable. Signed-off-by: Michel Dänzer --- glamor/glamor.c | 35 +