summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2006-06-21 09:28:00 +0000
committerobrien <obrien@FreeBSD.org>2006-06-21 09:28:00 +0000
commit0af3611cb630b0c4b7858a027487eec4d9f8d35c (patch)
tree6ca2c115d35f453744a20ef2c37e58e471f2090a
parent5c5b299c7d54da4b9c68e95d1f7a230405bd1ac2 (diff)
downloadFreeBSD-src-0af3611cb630b0c4b7858a027487eec4d9f8d35c.zip
FreeBSD-src-0af3611cb630b0c4b7858a027487eec4d9f8d35c.tar.gz
Fix segfault when '/etc/malloc.conf@ -> AJ' due to differnce between
calloc & malloc as agreed by vendor. Also remove an unused variable.
-rw-r--r--contrib/file/apprentice.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/contrib/file/apprentice.c b/contrib/file/apprentice.c
index 4432a56..a5bc4f2 100644
--- a/contrib/file/apprentice.c
+++ b/contrib/file/apprentice.c
@@ -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;
OpenPOWER on IntegriCloud