Module Name: xsrc
Committed By: tsutsui
Date: Sun Jul 20 10:45:05 UTC 2014
Modified Files:
xsrc/external/mit/xf86-video-wsfb/dist/src: wsfb_driver.c
Log Message:
Add one more cmsize == 0 check before PUTCMAP ioctl.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 \
xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c
diff -u xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.23 xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.24
--- xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c:1.23 Sun Jul 20 09:45:20 2014
+++ xsrc/external/mit/xf86-video-wsfb/dist/src/wsfb_driver.c Sun Jul 20 10:45:05 2014
@@ -1186,7 +1186,8 @@ WsfbLeaveVT(int scrnIndex, int flags)
* we're backing off
*/
- if (fPtr->fbi.fbi_pixeltype == WSFB_CI) {
+ if (fPtr->fbi.fbi_pixeltype == WSFB_CI &&
+ fPtr->fbi.fbi_subtype.fbi_cmapinfo.cmap_entries > 0) {
/* reset colormap for text mode */
if (ioctl(fPtr->fd, WSDISPLAYIO_PUTCMAP,
&(fPtr->saved_cmap)) == -1) {
