svn commit: r241601 - in stable/9: lib/libc/rpc sys/rpc

[Pedro F. Giffuni]

Author: pfg
Date: Tue Oct 16 01:37:17 2012
New Revision: 241601
URL: http://svn.freebsd.org/changeset/base/241601

Log:
  MFC	r241143:
  
  rpc: be sure to free cl_netid and cl_tp.
  
  When creating a client with clnt_tli_create, it uses strdup to copy
  strings for these fields if nconf is passed in. clnt_dg_destroy frees
  these strings already. Make sure clnt_vc_destroy frees them in the same
  way.
  
  Tested by:	David Wolfskill
  Obtained from:	Bull GNU/Linux NFSv4 Project (libtirpc)

Modified:
  stable/9/lib/libc/rpc/clnt_vc.c
  stable/9/sys/rpc/clnt_vc.c

Modified: stable/9/lib/libc/rpc/clnt_vc.c
==============================================================================
--- stable/9/lib/libc/rpc/clnt_vc.c	Tue Oct 16 01:10:43 2012	(r241600)
+++ stable/9/lib/libc/rpc/clnt_vc.c	Tue Oct 16 01:37:17 2012	(r241601)
@@ -672,6 +672,10 @@ clnt_vc_destroy(cl)
 	if (ct->ct_addr.buf)
 		free(ct->ct_addr.buf);
 	mem_free(ct, sizeof(struct ct_data));
+	if (cl->cl_netid && cl->cl_netid[0])
+		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
+	if (cl->cl_tp && cl->cl_tp[0])
+		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
 	mem_free(cl, sizeof(CLIENT));
 	mutex_unlock(&clnt_fd_lock);
 	thr_sigsetmask(SIG_SETMASK, &(mask), NULL);

Modified: stable/9/sys/rpc/clnt_vc.c
==============================================================================
--- stable/9/sys/rpc/clnt_vc.c	Tue Oct 16 01:10:43 2012	(r241600)
+++ stable/9/sys/rpc/clnt_vc.c	Tue Oct 16 01:37:17 2012	(r241601)
@@ -836,6 +836,10 @@ clnt_vc_destroy(CLIENT *cl)
 		soclose(so);
 	}
 	mem_free(ct, sizeof(struct ct_data));
+	if (cl->cl_netid && cl->cl_netid[0])
+		mem_free(cl->cl_netid, strlen(cl->cl_netid) +1);
+	if (cl->cl_tp && cl->cl_tp[0])
+		mem_free(cl->cl_tp, strlen(cl->cl_tp) +1);
 	mem_free(cl, sizeof(CLIENT));
 }