xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/dmx/dmxfont.c          |    2 +-
 hw/dmx/glxProxy/glxcmds.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit d9e99edd4dcf109492abdaa73ccf8f29d5bfd159
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 30 13:49:06 2014 -0400

    glxproxy: Fix memory leak on error path in CreateGLXPixmap (#50281) (v2)
    
    v2: Fix another path spotted by keithp
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/glxProxy/glxcmds.c b/hw/dmx/glxProxy/glxcmds.c
index 964db40..23c3366 100644
--- a/hw/dmx/glxProxy/glxcmds.c
+++ b/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;
     }
commit dff1f5e1a9608eda2992fc9e3304edee7b5bee9b
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 30 13:49:05 2014 -0400

    dmx: Fix memory leak in dmxBELoadFont (#50281)
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Jasper St. Pierre <jstpierre at mecheye.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/dmxfont.c b/hw/dmx/dmxfont.c
index 6b81826..115422d 100644
--- a/hw/dmx/dmxfont.c
+++ b/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;
         }
     }