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

plug memory leak on file matching

Browse Source 
make it not fall over when no non matching acl
make fnmatch matching useful by switching arguments


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@13549 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2004-03-20 07:05:46 +00:00
parent 08d9c002c9
commit 4b69fa3283
1 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/krb5/acl.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000 - 2002 Kungliga Tekniska H<>gskolan * Copyright (c) 2000 - 2002, 2004 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -46,9 +46,24 @@ struct acl_field {
}; };
static void static void
acl_free_list(struct acl_field *acl) free_retv(struct acl_field *acl)
{
while(acl != NULL) {
if (acl->type == acl_retval) {
if (*acl->u.retv)
free(*acl->u.retv);
*acl->u.retv = NULL;
}
acl = acl->next;
}
}
static void
acl_free_list(struct acl_field *acl, int retv)
{ {
struct acl_field *next; struct acl_field *next;
if (retv)
free_retv(acl);
while(acl != NULL) { while(acl != NULL) {
next = acl->next; next = acl->next;
free(acl); free(acl);
@@ -69,7 +84,7 @@ acl_parse_format(krb5_context context,
tmp = malloc(sizeof(*tmp)); tmp = malloc(sizeof(*tmp));
if(tmp == NULL) { if(tmp == NULL) {
krb5_set_error_string(context, "malloc: out of memory"); krb5_set_error_string(context, "malloc: out of memory");
acl_free_list(acl); acl_free_list(acl, 0);
return ENOMEM; return ENOMEM;
} }
if(*p == 's') { if(*p == 's') {
@@ -81,6 +96,12 @@ acl_parse_format(krb5_context context,
} else if(*p == 'r') { } else if(*p == 'r') {
tmp->type = acl_retval; tmp->type = acl_retval;
tmp->u.retv = va_arg(ap, char **); tmp->u.retv = va_arg(ap, char **);
*tmp->u.retv = NULL;
} else {
krb5_set_error_string(context, "acl_parse_format: "
"unknown format specifier %c", *p);
acl_free_list(acl, 0);
return EINVAL;
} }
tmp->next = NULL; tmp->next = NULL;
if(acl == NULL) if(acl == NULL)
@@ -99,9 +120,9 @@ acl_match_field(krb5_context context,
struct acl_field *field) struct acl_field *field)
{ {
if(field->type == acl_string) { if(field->type == acl_string) {
return !strcmp(string, field->u.cstr); return !strcmp(field->u.cstr, string);
} else if(field->type == acl_fnmatch) { } else if(field->type == acl_fnmatch) {
return !fnmatch(string, field->u.cstr, 0); return !fnmatch(field->u.cstr, string, 0);
} else if(field->type == acl_retval) { } else if(field->type == acl_retval) {
*field->u.retv = strdup(string); *field->u.retv = strdup(string);
return TRUE; return TRUE;
@@ -115,14 +136,18 @@ acl_match_acl(krb5_context context,
const char *string) const char *string)
{ {
char buf[256]; char buf[256];
for(;strsep_copy(&string, " \t", buf, sizeof(buf)) != -1; while(strsep_copy(&string, " \t", buf, sizeof(buf)) != -1) {
acl = acl->next) {
if(buf[0] == '\0') if(buf[0] == '\0')
continue; /* skip ws */ continue; /* skip ws */
if (acl == NULL)
return FALSE;
if(!acl_match_field(context, buf, acl)) { if(!acl_match_field(context, buf, acl)) {
return FALSE; return FALSE;
} }
acl = acl->next;
} }
if (acl)
return FALSE;
return TRUE; return TRUE;
} }
@@ -145,7 +170,7 @@ krb5_acl_match_string(krb5_context context,
return ret; return ret;
found = acl_match_acl(context, acl, string); found = acl_match_acl(context, acl, string);
acl_free_list(acl); acl_free_list(acl, !found);
if (found) { if (found) {
return 0; return 0;
} else { } else {
@@ -192,10 +217,11 @@ krb5_acl_match_file(krb5_context context,
found = TRUE; found = TRUE;
break; break;
} }
free_retv(acl);
} }
fclose(f); fclose(f);
acl_free_list(acl); acl_free_list(acl, !found);
if (found) { if (found) {
return 0; return 0;
} else { } else {