frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check for visual==NULL in dmxBECreateColormap() before calling XCreateColormap() 

to prevent potential segfault.
This commit is contained in:
Brian 2006-09-23 10:38:10 -06:00
parent 945b7c6394
commit f7c1d94241
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
hw/dmx/dmxcmap.c
View File

@ -40,6 +40,7 @@
#endif #endif
#include "dmx.h" #include "dmx.h"
#include "dmxlog.h"
#include "dmxsync.h" #include "dmxsync.h"
#include "dmxcmap.h" #include "dmxcmap.h"
#include "dmxvisual.h" #include "dmxvisual.h"
@ -83,12 +84,18 @@ Bool dmxBECreateColormap(ColormapPtr pColormap)
VisualPtr pVisual = pColormap->pVisual; VisualPtr pVisual = pColormap->pVisual;
Visual *visual = dmxLookupVisual(pScreen, pVisual); Visual *visual = dmxLookupVisual(pScreen, pVisual);
pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay, if (visual) {
dmxScreen->scrnWin, pCmapPriv->cmap = XCreateColormap(dmxScreen->beDisplay,
visual, dmxScreen->scrnWin,
(pVisual->class & DynamicClass ? visual,
AllocAll : AllocNone)); (pVisual->class & DynamicClass ?
return (pCmapPriv->cmap != 0); AllocAll : AllocNone));
return (pCmapPriv->cmap != 0);
}
else {
dmxLog(dmxWarning, "dmxBECreateColormap: No visual found\n");
return 0;
}
} }
/** Create colormap on back-end server associated with \a pColormap's /** Create colormap on back-end server associated with \a pColormap's