diff options
| author | marha <marha@users.sourceforge.net> | 2014-05-23 19:36:09 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-05-23 19:38:24 +0200 |
| commit | 63bfcd0be46413dda8c22b914d12f66ea5d5c66d (patch) | |
| tree | 252bfea78ff3ccfabedc3b84c8a7331c74e902cd /xorg-server/hw/dmx | |
| parent | 55cf29d7f748b814a2b8eb016fbf15635d56aa53 (diff) | |
| download | vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.tar.gz vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.tar.bz2 vcxsrv-63bfcd0be46413dda8c22b914d12f66ea5d5c66d.zip | |
libX11 mesa xserver pixman git update 23 May 2014
xserver commit db2e708f31a162c6c66643d3559dd5f3e21ee06b
libX11 commit e3dc0d17339e61eaf0b51b8907510984e3bf23cb
pixman commit 9cd283b2eb8279824406bfd47b020d21fc00cf82
mesa commit 404387ecd72a4a9ace8c1fa6895823aabfd759ad
Diffstat (limited to 'xorg-server/hw/dmx')
| -rw-r--r-- | xorg-server/hw/dmx/dmxfont.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/glxProxy/glxcmds.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xorg-server/hw/dmx/dmxfont.c b/xorg-server/hw/dmx/dmxfont.c index 6b81826c9..115422d41 100644 --- a/xorg-server/hw/dmx/dmxfont.c +++ b/xorg-server/hw/dmx/dmxfont.c @@ -397,12 +397,12 @@ dmxBELoadFont(ScreenPtr pScreen, FontPtr pFont) "font-path-related options, see the Xdmx man page.\n"); } + free(goodfps); if (!dmxIgnoreBadFontPaths || (dmxIgnoreBadFontPaths && dmxSetFontPath(dmxScreen))) { /* We still have errors so return with error */ dmxFreeFontPath(fp); XFreeFontPath(oldFontPath); - free(goodfps); return FALSE; } } diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c index 964db4069..23c3366bd 100644 --- a/xorg-server/hw/dmx/glxProxy/glxcmds.c +++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c @@ -2009,6 +2009,7 @@ CreateGLXPixmap(__GLXclientState * cl, } else { client->errorValue = (visual ? visual : fbconfigId); + free(pGlxPixmap->be_xids); free(pGlxPixmap); return BadValue; } @@ -2017,6 +2018,7 @@ CreateGLXPixmap(__GLXclientState * cl, } if (!(AddResource(glxpixmapId, __glXPixmapRes, pGlxPixmap))) { + free(pGlxPixmap->be_xids); free(pGlxPixmap); return BadAlloc; } |