[PATCH xserver] exa: Use PictureMatchFormat for source-only picture format description

Michel Dänzer michel at daenzer.net
Fri Jun 1 09:58:17 UTC 2018


From: Michel Dänzer <michel.daenzer at amd.com>

Their pFormat member is NULL, which resulted in a crash in
miRenderColorToPixel.

Fixes: 8171d4c2d67b "render: Store and use all 16bpc of precision for
                     solid pixels (v2.1)"
Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>
---
 exa/exa_render.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/exa/exa_render.c b/exa/exa_render.c
index 50a9a659e..9fbfdfca2 100644
--- a/exa/exa_render.c
+++ b/exa/exa_render.c
@@ -291,7 +291,8 @@ exaTryDriverSolidFill(PicturePtr pSrc,
         pixel = exaGetPixmapFirstPixel(pSrcPix);
     }
     else
-        miRenderColorToPixel(pSrc->pFormat,
+        miRenderColorToPixel(PictureMatchFormat(pDst->pDrawable->pScreen, 32,
+                                                pSrc->format),
                              &pSrc->pSourcePict->solidFill.fullcolor,
                              &pixel);
 
-- 
2.17.0



More information about the xorg-devel mailing list