From 992673157077080f3d5637c7f666e43639181a91 Mon Sep 17 00:00:00 2001 From: Mihai Moldovan Date: Sat, 7 Jul 2018 08:04:51 +0200 Subject: misc: fix more regressions and whitespace weirdness introduced in 913fcf1a74426725f14380dd5b34286a21c37ab7. --- nx-X11/lib/include/xtrans/Xtrans.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'nx-X11/lib/include/xtrans/Xtrans.c') 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; } -- cgit v1.2.3