Module Name: src
Committed By: riz
Date: Sun Mar 31 20:26:59 UTC 2013
Modified Files:
src/lib/libc/rpc [netbsd-6-0]: clnt_vc.c
Log Message:
Pull up following revision(s) (requested by christos in ticket #854):
lib/libc/rpc/clnt_vc.c: revision 1.19
PR/13082: Thorsten Brehm: Fix wrong memcpy that caused possible memory
corruption. XXX: pullup to 6.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.12.1 src/lib/libc/rpc/clnt_vc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/rpc/clnt_vc.c
diff -u src/lib/libc/rpc/clnt_vc.c:1.17 src/lib/libc/rpc/clnt_vc.c:1.17.12.1
--- src/lib/libc/rpc/clnt_vc.c:1.17 Wed Dec 8 02:06:38 2010
+++ src/lib/libc/rpc/clnt_vc.c Sun Mar 31 20:26:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: clnt_vc.c,v 1.17 2010/12/08 02:06:38 joerg Exp $ */
+/* $NetBSD: clnt_vc.c,v 1.17.12.1 2013/03/31 20:26:59 riz Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -36,7 +36,7 @@ static char *sccsid = "@(#)clnt_tcp.c 1.
static char *sccsid = "@(#)clnt_tcp.c 2.2 88/08/01 4.0 RPCSRC";
static char sccsid[] = "@(#)clnt_vc.c 1.19 89/03/16 Copyr 1988 Sun Micro";
#else
-__RCSID("$NetBSD: clnt_vc.c,v 1.17 2010/12/08 02:06:38 joerg Exp $");
+__RCSID("$NetBSD: clnt_vc.c,v 1.17.12.1 2013/03/31 20:26:59 riz Exp $");
#endif
#endif
@@ -262,8 +262,8 @@ clnt_vc_create(fd, raddr, prog, vers, se
ct->ct_addr.buf = malloc((size_t)raddr->maxlen);
if (ct->ct_addr.buf == NULL)
goto fooy;
- memcpy(ct->ct_addr.buf, &raddr->buf, (size_t)raddr->len);
- ct->ct_addr.len = raddr->maxlen;
+ memcpy(ct->ct_addr.buf, raddr->buf, (size_t)raddr->len);
+ ct->ct_addr.len = raddr->len;
ct->ct_addr.maxlen = raddr->maxlen;
/*