d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a use of an uninitialized pointer in xdr_rpcbs_rmtcalllist().

Browse Source 
This appears to have been introduced in r173763.  Also fix the confusing
indentation that probably led to the bug in the first place.

PR:		243759
Diagnosed by:	martin@lispworks.com
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mark Johnston 2020-02-05 16:10:09 +00:00
parent 51d7f2ed58
commit a3a706387e
1 changed files with 85 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/libc/rpc/rpcb_st_xdr.c
View File

@ -71,7 +71,6 @@ xdr_rpcbs_addrlist(XDR *xdrs, rpcbs_addrlist *objp)
} }
pnext = &objp->next; pnext = &objp->next;
if (!xdr_pointer(xdrs, (char **) pnext, if (!xdr_pointer(xdrs, (char **) pnext,
sizeof (rpcbs_addrlist), sizeof (rpcbs_addrlist),
(xdrproc_t)xdr_rpcbs_addrlist)) { (xdrproc_t)xdr_rpcbs_addrlist)) {
@ -86,9 +85,10 @@ xdr_rpcbs_addrlist(XDR *xdrs, rpcbs_addrlist *objp)
bool_t bool_t
xdr_rpcbs_rmtcalllist(XDR *xdrs, rpcbs_rmtcalllist *objp) xdr_rpcbs_rmtcalllist(XDR *xdrs, rpcbs_rmtcalllist *objp)
{ {
int32_t *buf;
struct rpcbs_rmtcalllist **pnext; struct rpcbs_rmtcalllist **pnext;
int32_t *buf;
pnext = &objp->next;
if (xdrs->x_op == XDR_ENCODE) { if (xdrs->x_op == XDR_ENCODE) {
buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT); buf = XDR_INLINE(xdrs, 6 * BYTES_PER_XDR_UNIT);
if (buf == NULL) { if (buf == NULL) {
@ -121,7 +121,6 @@ xdr_rpcbs_rmtcalllist(XDR *xdrs, rpcbs_rmtcalllist *objp)
if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) { if (!xdr_string(xdrs, &objp->netid, RPC_MAXDATASIZE)) {
return (FALSE); return (FALSE);
} }
pnext = &objp->next;
if (!xdr_pointer(xdrs, (char **) pnext, if (!xdr_pointer(xdrs, (char **) pnext,
sizeof (rpcbs_rmtcalllist), sizeof (rpcbs_rmtcalllist),
(xdrproc_t)xdr_rpcbs_rmtcalllist)) { (xdrproc_t)xdr_rpcbs_rmtcalllist)) {