aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/include/xtrans
diff options
context:
space:
mode:
Diffstat (limited to 'nx-X11/lib/include/xtrans')
-rw-r--r--nx-X11/lib/include/xtrans/Xtrans.c10
-rw-r--r--nx-X11/lib/include/xtrans/Xtranssock.c3
2 files changed, 8 insertions, 5 deletions
diff --git a/nx-X11/lib/include/xtrans/Xtrans.c b/nx-X11/lib/include/xtrans/Xtrans.c
index aa9646261..3665c8d78 100644
--- a/nx-X11/lib/include/xtrans/Xtrans.c
+++ b/nx-X11/lib/include/xtrans/Xtrans.c
@@ -980,17 +980,17 @@ TRANS(GetMyAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
{
prmsg (1,"GetMyAddr: malloc failed\n");
return -1;
- } else {
- memcpy(*addrp, ciptr->addr, ciptr->addrlen);
- free(addrp);
}
+
+ memcpy(*addrp, ciptr->addr, ciptr->addrlen);
+
return 0;
}
#endif
int
TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
- Xtransaddr **addrp)
+ Xtransaddr **addrp)
{
prmsg (2,"GetPeerAddr(%d)\n", ciptr->fd);
@@ -1003,7 +1003,9 @@ TRANS(GetPeerAddr) (XtransConnInfo ciptr, int *familyp, int *addrlenp,
prmsg (1,"GetPeerAddr: malloc failed\n");
return -1;
}
+
memcpy(*addrp, ciptr->peeraddr, ciptr->peeraddrlen);
+
return 0;
}
diff --git a/nx-X11/lib/include/xtrans/Xtranssock.c b/nx-X11/lib/include/xtrans/Xtranssock.c
index 090a325ce..47c0a0409 100644
--- a/nx-X11/lib/include/xtrans/Xtranssock.c
+++ b/nx-X11/lib/include/xtrans/Xtranssock.c
@@ -2442,7 +2442,7 @@ SocketUNIXConnectPost:
(ciptr->peeraddr = malloc(namelen)) == NULL)
{
prmsg (1,
- "SocketUNIXCreateListener: Can't allocate space for the addr\n");
+ "SocketUNIXCreateListener: Can't allocate space for the addr\n");
return TRANS_CONNECT_FAILED;
}
@@ -2454,6 +2454,7 @@ SocketUNIXConnectPost:
ciptr->peeraddrlen = namelen;
memcpy (ciptr->addr, &sockname, ciptr->addrlen);
memcpy (ciptr->peeraddr, &sockname, ciptr->peeraddrlen);
+
return 0;
}