From: Greg Hudson Date: Sat, 11 Aug 2012 04:17:50 +0000 (-0400) Subject: Stop misusing gss_release_buffer in test programs X-Git-Tag: krb5-1.11-alpha1~328 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64903f771f8ca381013ec49fc2a5e5d69bf4bcff;p=thirdparty%2Fkrb5.git Stop misusing gss_release_buffer in test programs Use free() instead of gss_release_buffer() when freeing the locally allocated context_token in the sample gss-server program. Use gssalloc_free() instead of free when freeing buffers in t_kgss_kernel.c (where we can't use gss_release_buffer). --- diff --git a/src/appl/gss-sample/gss-server.c b/src/appl/gss-sample/gss-server.c index 0f5fea0f81..ed78be58ca 100644 --- a/src/appl/gss-sample/gss-server.c +++ b/src/appl/gss-sample/gss-server.c @@ -382,7 +382,7 @@ test_import_export_context(gss_ctx_id_t *context) if (verbose && logfile) fprintf(logfile, "Importing context: %7.4f seconds\n", timeval_subtract(&tm1, &tm2)); - (void) gss_release_buffer(&min_stat, &context_token); + free(context_token.value); return 0; } diff --git a/src/util/gss-kernel-lib/t_kgss_kernel.c b/src/util/gss-kernel-lib/t_kgss_kernel.c index 890a7d949e..bc961eb50c 100644 --- a/src/util/gss-kernel-lib/t_kgss_kernel.c +++ b/src/util/gss-kernel-lib/t_kgss_kernel.c @@ -110,7 +110,7 @@ read_wrap_token(gss_ctx_id_t ctx) major = krb5_gss_unwrap(&minor, ctx, &wrapped, &buf, NULL, NULL); check(major, minor, "krb5_gss_unwrap"); assert(buf.length == 8 && memcmp(buf.value, "userwrap", 8) == 0); - free(buf.value); + gssalloc_free(buf.value); free(wrapped.value); } @@ -178,7 +178,7 @@ send_wrap_token(gss_ctx_id_t ctx) &wrapped); check(major, minor, "krb5_gss_wrap"); send_data(STDOUT_FILENO, wrapped.value, wrapped.length); - free(wrapped.value); + gssalloc_free(wrapped.value); } /* Create a wrap token for the text "kernelmic" and send it to stdout. */ @@ -193,7 +193,7 @@ send_mic_token(gss_ctx_id_t ctx) major = krb5_gss_get_mic(&minor, ctx, GSS_C_QOP_DEFAULT, &buf, &mic); check(major, minor, "krb5_gss_get_mic"); send_data(STDOUT_FILENO, mic.value, mic.length); - free(mic.value); + gssalloc_free(mic.value); } /* Create an IOV token for "kernelwrapmic", wrapping only the "wrap" part, and