plug leak

[mech_eap.orig] / get_mic.c

diff --git a/get_mic.c b/get_mic.c
index 9dde401..2fa71a2 100644 (file)
--- a/get_mic.c
+++ b/get_mic.c
@@ -42,10 +42,12 @@ gss_get_mic(OM_uint32 *minor,
     OM_uint32 major;
     gss_iov_buffer_desc iov[2];
 
-    *minor = 0;
-
-    if (ctx == GSS_C_NO_CONTEXT)
+    if (ctx == GSS_C_NO_CONTEXT) {
+        *minor = EINVAL;
         return GSS_S_NO_CONTEXT;
+    }
+
+    *minor = 0;
 
     message_token->value = NULL;
     message_token->length = 0;
@@ -53,6 +55,7 @@ gss_get_mic(OM_uint32 *minor,
     GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
     if (!CTX_IS_ESTABLISHED(ctx)) {
+        *minor = GSSEAP_CONTEXT_INCOMPLETE;
         major = GSS_S_NO_CONTEXT;
         goto cleanup;
     }
@@ -65,9 +68,10 @@ gss_get_mic(OM_uint32 *minor,
     iov[1].buffer.length = 0;
 
     major = gssEapWrapOrGetMIC(minor, ctx, FALSE, NULL, iov, 2, TOK_TYPE_MIC);
-    if (major == GSS_S_COMPLETE) {
-        *message_token = iov[1].buffer;
-    }
+    if (GSS_ERROR(major))
+        goto cleanup;
+
+    *message_token = iov[1].buffer;
 
 cleanup:
     GSSEAP_MUTEX_UNLOCK(&ctx->mutex);