svn rev #21537: branches/mskrb-integ/src/lib/gssapi/krb5/

lhoward@MIT.EDU lhoward at MIT.EDU
Thu Dec 18 08:35:58 EST 2008


http://src.mit.edu/fisheye/changelog/krb5/?cs=21537
Commit By: lhoward
Log Message:
Clear GSS_IOV_BUFFER_FLAG_ALLOCATED after releasing



Changed Files:
U   branches/mskrb-integ/src/lib/gssapi/krb5/k5unsealiov.c
U   branches/mskrb-integ/src/lib/gssapi/krb5/util_crypt.c
Modified: branches/mskrb-integ/src/lib/gssapi/krb5/k5unsealiov.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/k5unsealiov.c	2008-12-18 07:51:21 UTC (rev 21536)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/k5unsealiov.c	2008-12-18 13:35:57 UTC (rev 21537)
@@ -579,8 +579,10 @@
 				       tiov, i, toktype, toktype2);
     if (major_status == GSS_S_COMPLETE)
 	*data = *tdata;
-    else if (tdata->type & GSS_IOV_BUFFER_FLAG_ALLOCATED)
+    else if (tdata->type & GSS_IOV_BUFFER_FLAG_ALLOCATED) {
 	gss_release_buffer(NULL, &tdata->buffer);
+	tdata->type &= ~(GSS_IOV_BUFFER_FLAG_ALLOCATED);
+    }
 
 cleanup:
     if (tiov != NULL)

Modified: branches/mskrb-integ/src/lib/gssapi/krb5/util_crypt.c
===================================================================
--- branches/mskrb-integ/src/lib/gssapi/krb5/util_crypt.c	2008-12-18 07:51:21 UTC (rev 21536)
+++ branches/mskrb-integ/src/lib/gssapi/krb5/util_crypt.c	2008-12-18 13:35:57 UTC (rev 21537)
@@ -750,8 +750,10 @@
 
     data->buffer.length -= relative_padlength;
 
-    if (padding->type & GSS_IOV_BUFFER_FLAG_ALLOCATED)
+    if (padding->type & GSS_IOV_BUFFER_FLAG_ALLOCATED) {
 	gss_release_buffer(&minor, &padding->buffer);
+	padding->type &= ~(GSS_IOV_BUFFER_FLAG_ALLOCATED);
+    }
 
     padding->buffer.length = 0;
     padding->buffer.value = NULL;




More information about the cvs-krb5 mailing list