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

(parse_binding, parse_section): make sure everything is ok before

Browse Source 
adding to linked list


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@5082 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
1998-07-13 13:04:34 +00:00
parent 657ae63705
commit dcb7052a66
1 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/krb5/config_file.c
View File

@@ -202,17 +202,17 @@ parse_section(char *p, krb5_config_section **s, krb5_config_section **parent)
tmp = malloc(sizeof(*tmp)); tmp = malloc(sizeof(*tmp));
if (tmp == NULL) if (tmp == NULL)
return -1; return -1;
if (*s)
(*s)->next = tmp;
else
*parent = tmp;
*s = tmp;
tmp->name = strdup(p+1); tmp->name = strdup(p+1);
if (tmp->name == NULL) if (tmp->name == NULL)
return -1; return -1;
tmp->type = krb5_config_list; tmp->type = krb5_config_list;
tmp->u.list = NULL; tmp->u.list = NULL;
tmp->next = NULL; tmp->next = NULL;
if (*s)
(*s)->next = tmp;
else
*parent = tmp;
*s = tmp;
return 0; return 0;
} }
@@ -250,7 +250,7 @@ parse_binding(FILE *f, unsigned *lineno, char *p,
{ {
krb5_config_binding *tmp; krb5_config_binding *tmp;
char *p1; char *p1;
int ret; int ret = 0;
p1 = p; p1 = p;
while (*p && !isspace(*p)) while (*p && !isspace(*p))
@@ -261,11 +261,6 @@ parse_binding(FILE *f, unsigned *lineno, char *p,
tmp = malloc(sizeof(*tmp)); tmp = malloc(sizeof(*tmp));
if (tmp == NULL) if (tmp == NULL)
return -1; return -1;
if (*b)
(*b)->next = tmp;
else
*parent = tmp;
*b = tmp;
tmp->name = strdup(p1); tmp->name = strdup(p1);
tmp->next = NULL; tmp->next = NULL;
++p; ++p;
@@ -280,13 +275,16 @@ parse_binding(FILE *f, unsigned *lineno, char *p,
tmp->type = krb5_config_list; tmp->type = krb5_config_list;
tmp->u.list = NULL; tmp->u.list = NULL;
ret = parse_list (f, lineno, &tmp->u.list); ret = parse_list (f, lineno, &tmp->u.list);
if (ret)
return ret;
} else { } else {
tmp->type = krb5_config_string; tmp->type = krb5_config_string;
tmp->u.string = strdup(p); tmp->u.string = strdup(p);
} }
return 0; if (*b)
(*b)->next = tmp;
else
*parent = tmp;
*b = tmp;
return ret;
} }
krb5_error_code krb5_error_code