remove util_alloc.c

[mech_eap.orig] / wrap_iov.c

diff --git a/wrap_iov.c b/wrap_iov.c
index cdf9c3b..10a3254 100644 (file)
--- a/wrap_iov.c
+++ b/wrap_iov.c
@@ -328,18 +328,26 @@ gss_wrap_iov(OM_uint32 *minor,
 {
     OM_uint32 major;
 
-    if (ctx == GSS_C_NO_CONTEXT)
+    if (ctx == GSS_C_NO_CONTEXT) {
+        *minor = EINVAL;
         return GSS_S_NO_CONTEXT;
+    }
+
+    *minor = 0;
 
     GSSEAP_MUTEX_LOCK(&ctx->mutex);
 
     if (!CTX_IS_ESTABLISHED(ctx)) {
-        *minor = 0;
         major = GSS_S_NO_CONTEXT;
-    } else
-        major = gssEapWrapOrGetMIC(minor, ctx, conf_req_flag, conf_state,
-                                   iov, iov_count, TOK_TYPE_WRAP);
+        goto cleanup;
+    }
+
+    major = gssEapWrapOrGetMIC(minor, ctx, conf_req_flag, conf_state,
+                               iov, iov_count, TOK_TYPE_WRAP);
+    if (GSS_ERROR(major))
+        goto cleanup;
 
+cleanup:
     GSSEAP_MUTEX_UNLOCK(&ctx->mutex);
 
     return major;