[X2Go-Commits] [nx-libs] 02/04: Xserver/hw/nxagent/Clipboard.c: Fix free calls (free back to XFree).

git-admin at x2go.org git-admin at x2go.org
Fri Dec 15 11:35:53 CET 2017


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 5597f2ea509d14fd5589399011c1b8b728901a83
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Dec 14 11:27:35 2017 +0100

    Xserver/hw/nxagent/Clipboard.c: Fix free calls (free back to XFree).
    
     They have been flawed ever since nxagent came up, as they were Xfree
     (non-capital f) always, but should have been XFree (capital F, defined
     in Xlibint.h and part of libNX_X11).
     .
     Probably this all should be free() all over the code (bearing in mind,
     that XFree() returns int, not void. But still...
    
     Fixes ArcticaProject/nx-libs#553.
---
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index f34849d..41c81cd 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -754,7 +754,7 @@ void nxagentCollectPropertyEvent(int resource)
 
         if (pszReturnData != NULL)
         {
-          free(pszReturnData);
+          XFree(pszReturnData);
         }
 
         return;
@@ -796,7 +796,7 @@ void nxagentCollectPropertyEvent(int resource)
 
         if (pszReturnData != NULL)
         {
-          free(pszReturnData);
+          XFree(pszReturnData);
         }
 
         return;
@@ -974,7 +974,7 @@ void nxagentNotifySelection(XEvent *X)
           }
 
           /*
-           * free(pszReturnData);
+           * XFree(pszReturnData);
            * pszReturnData=NULL;
            */
 

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


More information about the x2go-commits mailing list