[X2Go-Commits] [nx-libs] 103/108: xkb: Don't check for NULL before calling free

[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 b01e29efffafe9f426eb88ba400e2fa24de548aa
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Mon Oct 29 23:39:03 2018 +0100

    xkb: Don't check for NULL before calling free
    
    Author: Pauli Nieminen <ext-pauli.nieminen at nokia.com>
      Date:   Thu Jul 22 11:34:54 2010 +0300
    
        xkb: Don't check for NULL before calling free
    
        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 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nx-X11/programs/Xserver/xkb/ddxList.c b/nx-X11/programs/Xserver/xkb/ddxList.c
index e751b6b..5466cff 100644
--- a/nx-X11/programs/Xserver/xkb/ddxList.c
+++ b/nx-X11/programs/Xserver/xkb/ddxList.c
@@ -209,8 +209,7 @@ char	tmpname[PATH_MAX];
     }
     if (!in)
     {
-        if (buf != NULL)
-	    free (buf);
+	free (buf);
 #ifdef WIN32
 	unlink(tmpname);
 #endif
@@ -276,8 +275,7 @@ char	tmpname[PATH_MAX];
     fclose(in);
     unlink(tmpname);
 #endif
-    if (buf != NULL)
-        free (buf);
+    free (buf);
     return status;
 }
 

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