From: Christos Zoulas <christos@zoulas.com>
Date: Mon, 26 Mar 2007 17:59:49 +0000 (+0000)
Subject: make sure that all of magic_set is initialized.
X-Git-Tag: FILE5_05~627
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=979b8504009fa3671cf2f0d9e1fa5d9d12fafb62;p=file

make sure that all of magic_set is initialized.
---

diff --git a/ChangeLog b/ChangeLog
index 4dcfe850..a23fdb29 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 
+2007-03-26 13:58 Christos Zoulas <christos@zoulas.com>
+
+	* make sure that all of struct magic_set is initialized appropriately
+	  (Brett)
+
 2007-03-25 17:44 Christos Zoulas <christos@zoulas.com>
 
 	* reset left bytes in the buffer (Dmitry V. Levin)
diff --git a/src/magic.c b/src/magic.c
index 5047733a..54db48b1 100644
--- a/src/magic.c
+++ b/src/magic.c
@@ -63,7 +63,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$File: magic.c,v 1.40 2007/03/01 22:14:55 christos Exp $")
+FILE_RCSID("@(#)$File: magic.c,v 1.41 2007/03/26 17:59:50 christos Exp $")
 #endif	/* lint */
 
 #ifdef __EMX__
@@ -86,7 +86,7 @@ magic_open(int flags)
 {
 	struct magic_set *ms;
 
-	if ((ms = malloc(sizeof(struct magic_set))) == NULL)
+	if ((ms = calloc((size_t)1, sizeof(struct magic_set))) == NULL)
 		return NULL;
 
 	if (magic_setflags(ms, flags) == -1) {
@@ -109,6 +109,8 @@ magic_open(int flags)
 	ms->haderr = 0;
 	ms->error = -1;
 	ms->mlist = NULL;
+	ms->file = "unknown";
+	ms->line = 0;
 	return ms;
 free3:
 	free(ms->o.pbuf);