Fix segfault when '/etc/malloc.conf@ -> AJ' due to differnce between
calloc & malloc as agreed by vendor. Also remove an unused variable.
This commit is contained in:
parent
88a5e5ac7b
commit
dbca37326f
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/vendor/file/dist/; revision=159825
@ -381,7 +381,7 @@ apprentice_file(struct magic_set *ms, struct magic **magicp, uint32_t *nmagicp,
|
||||
}
|
||||
|
||||
maxmagic = MAXMAGIS;
|
||||
if ((marray = malloc(maxmagic * sizeof(*marray))) == NULL) {
|
||||
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;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user