[X2Go-Commits] [nx-libs] 93/219: fb: fix memory leak in fbOverlayFinishScreenInit

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 9f9b790f855f4a969b4ae6730e9cad8a9e743a3a
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Thu Jun 20 00:42:01 2019 +0200

    fb: fix memory leak in fbOverlayFinishScreenInit
    
      commit 2aa935bc5cc1e2d5365a97b8c5bb3d33eb5fc758
      Author: Tiago Vignatti <tiago.vignatti at nokia.com>
      Date:   Fri Mar 25 22:10:55 2011 +0200
    
        fb: fix memory leak in fbOverlayFinishScreenInit
    
        Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
        Reviewed-by: Nicolas Peninguy <nico at lostgeeks.org>
        Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
---
 nx-X11/programs/Xserver/fb/fboverlay.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nx-X11/programs/Xserver/fb/fboverlay.c b/nx-X11/programs/Xserver/fb/fboverlay.c
index 6e0bbf252..95101a731 100644
--- a/nx-X11/programs/Xserver/fb/fboverlay.c
+++ b/nx-X11/programs/Xserver/fb/fboverlay.c
@@ -410,16 +410,20 @@ 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
 #ifdef FB_OLD_MISCREENINIT
 		       , (miBSFuncPtr) 0
 #endif
-		       ))
+		       )) {
+	free(pScrPriv);
 	return FALSE;
+    }
     /* MI thinks there's no frame buffer */
 #ifdef MITSHM
     ShmRegisterFbFuncs(pScreen);

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git