diff options
author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-06-29 09:05:56 +0000 |
---|---|---|
committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2013-06-29 09:05:56 +0000 |
commit | c28aa5b6e7e295c81a5ab6690356fbf751c8b0fc (patch) | |
tree | efe277e9e49f711e96fdbb96e2527d7ce5f4395a /driver | |
parent | fc7f7cd552b1e6c8f2a2398f0056b090f8e239ed (diff) |
Quick fix for NULL pixmaps with server 1.14.
Problem reported and fix tested by J. Scott Heppler. Thanks.
Diffstat (limited to 'driver')
-rw-r--r-- | driver/xf86-video-sis/src/sis310_accel.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/driver/xf86-video-sis/src/sis310_accel.c b/driver/xf86-video-sis/src/sis310_accel.c index 1a6f6395b..2c17f9f19 100644 --- a/driver/xf86-video-sis/src/sis310_accel.c +++ b/driver/xf86-video-sis/src/sis310_accel.c @@ -1878,6 +1878,9 @@ SiSUploadToScreen(PixmapPtr pDst, int x, int y, int w, int h, char *src, int src int dst_pitch = exaGetPixmapPitch(pDst); (pSiS->SyncAccel)(pScrn); + + if (dst == NULL) + return FALSE; if(pDst->drawable.bitsPerPixel < 8) return FALSE; |