From: Christos Zoulas <christos@zoulas.com>
Date: Wed, 30 Jan 2008 20:36:12 +0000 (+0000)
Subject: zero out utime/utimes buffer from  Gavin Atkinson <gavin@FreeBSD.org>
X-Git-Tag: FILE5_05~544
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4eb9676c259038046bd186aef88fb405ba3008e3;p=file

zero out utime/utimes buffer from  Gavin Atkinson <gavin@FreeBSD.org>
---

diff --git a/ChangeLog b/ChangeLog
index 8ecc90d1..ed457507 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-29 15:35 Christos Zoulas <christos@zoulas.com>
+
+	* zero out utime/utimes structs (Gavin Atkinson)
+
 2007-01-26 13:45 Christos Zoulas <christos@zoulas.com>
 
 	* reduce writable data from Diego "Flameeyes" Petten
diff --git a/src/magic.c b/src/magic.c
index 84d7c95d..03ae1b59 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.45 2007/12/27 16:35:59 christos Exp $")
+FILE_RCSID("@(#)$File: magic.c,v 1.46 2008/01/30 20:36:13 christos Exp $")
 #endif	/* lint */
 
 #ifdef __EMX__
@@ -218,6 +218,7 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd,
 		 */
 #ifdef HAVE_UTIMES
 		struct timeval  utsbuf[2];
+		(void)memset(utsbuf, 0, sizeof(utsbuf));
 		utsbuf[0].tv_sec = sb->st_atime;
 		utsbuf[1].tv_sec = sb->st_mtime;
 
@@ -225,6 +226,7 @@ close_and_restore(const struct magic_set *ms, const char *name, int fd,
 #elif defined(HAVE_UTIME_H) || defined(HAVE_SYS_UTIME_H)
 		struct utimbuf  utbuf;
 
+		(void)memset(utbuf, 0, sizeof(utbuf));
 		utbuf.actime = sb->st_atime;
 		utbuf.modtime = sb->st_mtime;
 		(void) utime(name, &utbuf); /* don't care if loses */