Fix a mismerge from NetBSD in r162194 with xdr_rpcb_entry_list_ptr(..)
This fixes the potential NULL pointer dereference properly, and also fixes memory leaks encountered in the process of iterating through `*rp`. MFC after: 1 week Found by: Valgrind Reported by: Dan Roberts <dan.roberts@isilon.com> Submitted by: Miles Ohlrich <miles.ohlrich@isilon.com> Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
parent
6420fb29aa
commit
c16d674c2d
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=293715
@ -207,14 +207,14 @@ xdr_rpcb_entry_list_ptr(XDR *xdrs, rpcb_entry_list_ptr *rp)
|
||||
* the case of freeing we must remember the next object
|
||||
* before we free the current object ...
|
||||
*/
|
||||
if (freeing)
|
||||
if (freeing && *rp)
|
||||
next = (*rp)->rpcb_entry_next;
|
||||
if (! xdr_reference(xdrs, (caddr_t *)rp,
|
||||
(u_int)sizeof (rpcb_entry_list),
|
||||
(xdrproc_t)xdr_rpcb_entry)) {
|
||||
return (FALSE);
|
||||
}
|
||||
if (freeing && *rp) {
|
||||
if (freeing) {
|
||||
next_copy = next;
|
||||
rp = &next_copy;
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user