[X2Go-Commits] [nx-libs] 102/108: xkb: Fix memory leak if opening file fails

[git-admin at x2go.org]

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

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

commit 90b83a79e6aed4e54ac29d022adf16be6869f054
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Oct 29 23:34:10 2018 +0100

    xkb: Fix memory leak if opening file fails
    
      Author: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
      Date:   Thu Jul 22 11:33:33 2010 +0300
    
        xkb: Fix memory leak if opening file fails
    
        If fopen fails pointer in buf would be overwriten with a new pointer.
    
        Signed-off-by: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
        Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
        Backported-to-NX-by: Ulrich Sibiller <uli42 at gmx.de>
---
 nx-X11/programs/Xserver/xkb/ddxList.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c
index e48e28d..e751b6b 100644
--- a/nx-X11/programs/Xserver/xkb/ddxList.c
+++ b/nx-X11/programs/Xserver/xkb/ddxList.c
@@ -167,6 +167,7 @@ char	tmpname[PATH_MAX];
 	}
 	if (!in) {
 	    haveDir= False;
+	    free(buf);
 	    buf = Xprintf(
 		"'%s/xkbcomp' '-R%s/%s' -w %ld -l -vlfhpR '%s'" W32_tmparg,
                 XkbBinDirectory,XkbBaseDirectory,componentDirs[what],(long)
@@ -182,6 +183,7 @@ char	tmpname[PATH_MAX];
 	}
 	if (!in) {
 	    haveDir= False;
+	    free(buf);
 	    buf = Xprintf(
 		"xkbcomp -R%s -w %ld -l -vlfhpR '%s'" W32_tmparg,
                 componentDirs[what],(long)

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