diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-05 14:52:19 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-05 14:52:19 +0000 |
| commit | 6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6 (patch) | |
| tree | 02e0d5fd297602d526b582dc527e007fe20a326f /xorg-server/fb/fboverlay.c | |
| parent | 1d142834bdb30308784a0654a39b7c0de7e37695 (diff) | |
| parent | eaedc21febeadad4cf0e370f5d97e7bdb4470870 (diff) | |
| download | vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.gz vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.tar.bz2 vcxsrv-6254e74e8b2ff8a2a1e8476a3300a7bdd65b7ad6.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb/fboverlay.c')
| -rw-r--r-- | xorg-server/fb/fboverlay.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/fb/fboverlay.c b/xorg-server/fb/fboverlay.c index 00092bb05..a241cf01f 100644 --- a/xorg-server/fb/fboverlay.c +++ b/xorg-server/fb/fboverlay.c @@ -384,12 +384,16 @@ fbOverlayFinishScreenInit(ScreenPtr pScreen, if (!fbInitVisuals (&visuals, &depths, &nvisuals, &ndepths, &depth1,
&defaultVisual, ((unsigned long)1<<(bpp1-1)) |
- ((unsigned long)1<<(bpp2-1)), 8))
+ ((unsigned long)1<<(bpp2-1)), 8)) {
+ free(pScrPriv);
return FALSE;
+ }
if (! miScreenInit(pScreen, 0, xsize, ysize, dpix, dpiy, 0,
depth1, ndepths, depths,
- defaultVisual, nvisuals, visuals))
+ defaultVisual, nvisuals, visuals)) {
+ free(pScrPriv);
return FALSE;
+ }
/* MI thinks there's no frame buffer */
#ifdef MITSHM
ShmRegisterFbFuncs(pScreen);
|