emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpwdgrp: fix counting of commas in group list

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2015-01-03 21:03:39 +01:00
parent 134c53098b
commit f9936676bb
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
libpwdgrp/pwd_grp.c
View File

@ -203,22 +203,6 @@ static char *parse_common(FILE *fp, const char *filename,
bb_error_msg("bad record at %s:%u", filename, count);
goto free_and_next;
}
S.string_size = S.tokenize_end - buf;
/* Ugly hack: group db requires additional buffer space
* for members[] array. If there is only one group, we need space
* for 3 pointers: alignment padding, group name, NULL.
* +1 for every additional group.
*/
if (n_fields == sizeof(GR_DEF)-1) { /* if we read group file */
int cnt = 3;
char *p = buf;
while (*p)
if (*p++ == ',')
cnt++;
S.string_size += cnt * sizeof(char*);
buf = xrealloc(buf, S.string_size);
}
if (!key) {
/* no key specified: sequential read, return a record */
@ -232,6 +216,24 @@ static char *parse_common(FILE *fp, const char *filename,
free(buf);
}
S.string_size = S.tokenize_end - buf;
/*
* Ugly hack: group db requires additional buffer space
* for members[] array. If there is only one group, we need space
* for 3 pointers: alignment padding, group name, NULL.
* +1 for every additional group.
*/
if (n_fields == sizeof(GR_DEF)-1) { /* if we read group file... */
int cnt = 3;
char *p = buf;
while (p < S.tokenize_end)
if (*p++ == ',')
cnt++;
S.string_size += cnt * sizeof(char*);
//bb_error_msg("+%d words = %u key:%s buf:'%s'", cnt, S.string_size, key, buf);
buf = xrealloc(buf, S.string_size);
}
return buf;
}