* mk_cred.c (krb5_mk_cred()), mk_priv.c (krb5_mk_priv()),

	* mk_safe.c (krb5_mk_safe()), rd_cred.c (krb5_rd_cred()),
	* rd_priv.c (krb5_rd_prev()), rd_safe.c (krb5_rd_safe()):
		Pass the contents pointer returned from krb5_make_fulladdr()
		to free() not the address of the pointer.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@5801 dc483132-0cff-0310-8789-dd5450dbe970

7 files changed, 21 insertions, 12 deletions

diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 609e8ab3c..dcdd4af2f 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,12 @@
+
+Thu May 11 18:30:21 1995  Chris Provenzano (proven@mit.edu)
+
+	* mk_cred.c (krb5_mk_cred()), mk_priv.c (krb5_mk_priv()),
+	* mk_safe.c (krb5_mk_safe()), rd_cred.c (krb5_rd_cred()),
+	* rd_priv.c (krb5_rd_prev()), rd_safe.c (krb5_rd_safe()):
+		Pass the contents pointer returned from krb5_make_fulladdr()
+		to free() not the address of the pointer.
+
 Tue May  9 08:34:21 1995  Ezra Peisach  <epeisach@kangaroo.mit.edu>
 
 	* Makefile.in (clean): Remove t_kerb and t_kerb.o
diff --git a/src/lib/krb5/krb/mk_cred.c b/src/lib/krb5/krb/mk_cred.c
index 8eb964040..d5b5f4e5a 100644
--- a/src/lib/krb5/krb/mk_cred.c
+++ b/src/lib/krb5/krb/mk_cred.c
@@ -270,7 +270,7 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
             if (!(retval = krb5_make_fulladdr(context, auth_context->local_addr,
                                  	      auth_context->local_port, 
 					      &local_fulladdr))) {
-            	CLEANUP_PUSH(&local_fulladdr.contents, free);
+            	CLEANUP_PUSH(local_fulladdr.contents, free);
 	    	plocal_fulladdr = &local_fulladdr;
             } else {
                 goto error;
@@ -285,7 +285,7 @@ krb5_mk_ncred(context, auth_context, ppcreds, ppdata, outdata)
             if (!(retval = krb5_make_fulladdr(context,auth_context->remote_addr,
                                  	      auth_context->remote_port, 
 					      &remote_fulladdr))){
-                CLEANUP_PUSH(&remote_fulladdr.contents, free);
+                CLEANUP_PUSH(remote_fulladdr.contents, free);
 	        premote_fulladdr = &remote_fulladdr;
             } else {
                 CLEANUP_DONE();
diff --git a/src/lib/krb5/krb/mk_priv.c b/src/lib/krb5/krb/mk_priv.c
index 7efbbafb2..5d5bd1faf 100644
--- a/src/lib/krb5/krb/mk_priv.c
+++ b/src/lib/krb5/krb/mk_priv.c
@@ -197,7 +197,7 @@ krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
 	    if (!(retval = krb5_make_fulladdr(context, auth_context->local_addr,
 				  	      auth_context->local_port, 
 					      &local_fulladdr))) {
-	    	CLEANUP_PUSH(&local_fulladdr.contents, free);
+	    	CLEANUP_PUSH(local_fulladdr.contents, free);
 	    	plocal_fulladdr = &local_fulladdr;
             } else {
     	    	goto error;
@@ -212,7 +212,7 @@ krb5_mk_priv(context, auth_context, userdata, outbuf, outdata)
 	    if (!(retval = krb5_make_fulladdr(context,auth_context->remote_addr,
 				 	      auth_context->remote_port, 
 					      &remote_fulladdr))){
-	    	CLEANUP_PUSH(&remote_fulladdr.contents, free);
+	    	CLEANUP_PUSH(remote_fulladdr.contents, free);
 	    	premote_fulladdr = &remote_fulladdr;
  	    } else {
 	        CLEANUP_DONE();
diff --git a/src/lib/krb5/krb/mk_safe.c b/src/lib/krb5/krb/mk_safe.c
index 53817fa7c..06861fbfd 100644
--- a/src/lib/krb5/krb/mk_safe.c
+++ b/src/lib/krb5/krb/mk_safe.c
@@ -180,7 +180,7 @@ krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
             if (!(retval = krb5_make_fulladdr(context, auth_context->local_addr,
                                  	      auth_context->local_port, 
 					      &local_fulladdr))){
-            	CLEANUP_PUSH(&local_fulladdr.contents, free);
+            	CLEANUP_PUSH(local_fulladdr.contents, free);
 	    	plocal_fulladdr = &local_fulladdr;
             } else {
                 goto error;
@@ -196,7 +196,7 @@ krb5_mk_safe(context, auth_context, userdata, outbuf, outdata)
             if (!(retval = krb5_make_fulladdr(context,auth_context->remote_addr,
                                  	      auth_context->remote_port, 
 					      &remote_fulladdr))){
-            	CLEANUP_PUSH(&remote_fulladdr.contents, free);
+            	CLEANUP_PUSH(remote_fulladdr.contents, free);
 	    	premote_fulladdr = &remote_fulladdr;
             } else {
                 CLEANUP_DONE();
diff --git a/src/lib/krb5/krb/rd_cred.c b/src/lib/krb5/krb/rd_cred.c
index 7a7b063bb..c83265000 100644
--- a/src/lib/krb5/krb/rd_cred.c
+++ b/src/lib/krb5/krb/rd_cred.c
@@ -245,7 +245,7 @@ krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata)
             if (!(retval = krb5_make_fulladdr(context,auth_context->local_addr,
                                  	      auth_context->local_port, 
 					      &local_fulladdr))){
-                CLEANUP_PUSH(&local_fulladdr.contents, free);
+                CLEANUP_PUSH(local_fulladdr.contents, free);
 	        plocal_fulladdr = &local_fulladdr;
             } else {
 	        return retval;
@@ -260,7 +260,7 @@ krb5_rd_cred(context, auth_context, pcreddata, pppcreds, outdata)
             if (!(retval = krb5_make_fulladdr(context,auth_context->remote_addr,
                                  	      auth_context->remote_port, 
 					      &remote_fulladdr))){
-                CLEANUP_PUSH(&remote_fulladdr.contents, free);
+                CLEANUP_PUSH(remote_fulladdr.contents, free);
 	        premote_fulladdr = &remote_fulladdr;
             } else {
 	        return retval;
diff --git a/src/lib/krb5/krb/rd_priv.c b/src/lib/krb5/krb/rd_priv.c
index aa962178a..c8d3565f5 100644
--- a/src/lib/krb5/krb/rd_priv.c
+++ b/src/lib/krb5/krb/rd_priv.c
@@ -210,7 +210,7 @@ krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
             if (!(retval = krb5_make_fulladdr(context, auth_context->local_addr,
                                  	      auth_context->local_port, 
 					      &local_fulladdr))){
-                CLEANUP_PUSH(&local_fulladdr.contents, free);
+                CLEANUP_PUSH(local_fulladdr.contents, free);
 	        plocal_fulladdr = &local_fulladdr;
             } else {
 	        return retval;
@@ -225,7 +225,7 @@ krb5_rd_priv(context, auth_context, inbuf, outbuf, outdata)
             if (!(retval = krb5_make_fulladdr(context,auth_context->remote_addr,
                                  	      auth_context->remote_port, 
 					      &remote_fulladdr))){
-                CLEANUP_PUSH(&remote_fulladdr.contents, free);
+                CLEANUP_PUSH(remote_fulladdr.contents, free);
 	        premote_fulladdr = &remote_fulladdr;
             } else {
                 CLEANUP_DONE();
diff --git a/src/lib/krb5/krb/rd_safe.c b/src/lib/krb5/krb/rd_safe.c
index 06d246d5b..33ad38aa6 100644
--- a/src/lib/krb5/krb/rd_safe.c
+++ b/src/lib/krb5/krb/rd_safe.c
@@ -201,7 +201,7 @@ krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
             if (!(retval = krb5_make_fulladdr(context, auth_context->local_addr,
                                  	      auth_context->local_port, 
 					      &local_fulladdr))){
-                CLEANUP_PUSH(&local_fulladdr.contents, free);
+                CLEANUP_PUSH(local_fulladdr.contents, free);
 	        plocal_fulladdr = &local_fulladdr;
             } else {
 	        return retval;
@@ -216,7 +216,7 @@ krb5_rd_safe(context, auth_context, inbuf, outbuf, outdata)
             if (!(retval = krb5_make_fulladdr(context,auth_context->remote_addr,
                                  	      auth_context->remote_port, 
 					      &remote_fulladdr))){
-                CLEANUP_PUSH(&remote_fulladdr.contents, free);
+                CLEANUP_PUSH(remote_fulladdr.contents, free);
 	        premote_fulladdr = &remote_fulladdr;
             } else {
 	        return retval;