d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This commit was generated by cvs2svn to compensate for changes in r159825,

Browse Source 
which included commits to RCS files with non-trunk default branches.
This commit is contained in:
David E. O'Brien 2006-06-21 09:28:00 +00:00
commit bc4990d51b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=159826
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
contrib/file/apprentice.c
View File

@ -380,8 +380,8 @@ apprentice_file(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
return -1;
}
maxmagic = MAXMAGIS;
if ((marray = malloc(maxmagic * sizeof(*marray))) == NULL) {
maxmagic = MAXMAGIS;
if ((marray = calloc(maxmagic, sizeof(*marray))) == NULL) {
(void)fclose(f);
file_oomem(ms);
return -1;
@ -509,7 +509,7 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,
char *t;
private const char *fops = FILE_OPS;
uint32_t val;
uint32_t cont_level, cont_count;
uint32_t cont_level;
cont_level = 0;