oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

protect error_string with mutex

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13237 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2003-12-19 01:25:12 +00:00
parent 9241394b39
commit deb075eb05
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/krb5/error_string.c
View File

@@ -41,17 +41,21 @@ RCSID("$Id$");
void void
krb5_free_error_string(krb5_context context, char *str) krb5_free_error_string(krb5_context context, char *str)
{ {
HEIMDAL_MUTEX_lock(context->mutex);
if (str != context->error_buf) if (str != context->error_buf)
free(str); free(str);
HEIMDAL_MUTEX_unlock(context->mutex);
} }
void void
krb5_clear_error_string(krb5_context context) krb5_clear_error_string(krb5_context context)
{ {
HEIMDAL_MUTEX_lock(context->mutex);
if (context->error_string != NULL if (context->error_string != NULL
&& context->error_string != context->error_buf) && context->error_string != context->error_buf)
free(context->error_string); free(context->error_string);
context->error_string = NULL; context->error_string = NULL;
HEIMDAL_MUTEX_unlock(context->mutex);
} }
krb5_error_code krb5_error_code
@@ -72,24 +76,34 @@ krb5_vset_error_string(krb5_context context, const char *fmt, va_list args)
__attribute__ ((format (printf, 2, 0))) __attribute__ ((format (printf, 2, 0)))
{ {
krb5_clear_error_string(context); krb5_clear_error_string(context);
HEIMDAL_MUTEX_lock(context->mutex);
vasprintf(&context->error_string, fmt, args); vasprintf(&context->error_string, fmt, args);
if(context->error_string == NULL) { if(context->error_string == NULL) {
vsnprintf (context->error_buf, sizeof(context->error_buf), fmt, args); vsnprintf (context->error_buf, sizeof(context->error_buf), fmt, args);
context->error_string = context->error_buf; context->error_string = context->error_buf;
} }
HEIMDAL_MUTEX_unlock(context->mutex);
return 0; return 0;
} }
char* char*
krb5_get_error_string(krb5_context context) krb5_get_error_string(krb5_context context)
{ {
char *ret = context->error_string; char *ret;
HEIMDAL_MUTEX_lock(context->mutex);
ret = context->error_string;
context->error_string = NULL; context->error_string = NULL;
HEIMDAL_MUTEX_unlock(context->mutex);
return ret; return ret;
} }
krb5_boolean krb5_boolean
krb5_have_error_string(krb5_context context) krb5_have_error_string(krb5_context context)
{ {
return context->error_string != NULL; char *str;
HEIMDAL_MUTEX_lock(context->mutex);
str = context->error_string;
HEIMDAL_MUTEX_unlock(context->mutex);
return str != NULL;
} }