From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 17 Sep 2007 20:19:58 +0000 (+0000)
Subject: Merged revisions 82676 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1400
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96d9f820e9502d5c8b83c3104aada62b43f98524;p=thirdparty%2Fasterisk.git

Merged revisions 82676 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r82676 | russell | 2007-09-17 15:16:25 -0500 (Mon, 17 Sep 2007) | 4 lines

Put a memset in ast_localtime() instead of a couple places in app_voicemail
to prevent the problem everywhere instead of just a couple of places.
(related to issue #10746)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82678 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 3a99622c33..54285c298d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1958,7 +1958,6 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
 #endif
 
 	gethostname(host, sizeof(host)-1);
-	memset(&tm, 0, sizeof(tm));
 
 	if (strchr(srcemail, '@'))
 		ast_copy_string(who, srcemail, sizeof(who));
@@ -2238,7 +2237,6 @@ static int get_date(char *s, int len)
 	struct ast_tm tm;
 	struct timeval t = ast_tvnow();
 	
-	memset(&tm, 0, sizeof(tm));
 	ast_localtime(&t, &tm, NULL);
 
 	return ast_strftime(s, len, "%a %b %e %r %Z %Y", &tm);
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 94513ae762..af8fe391d5 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1141,6 +1141,7 @@ static struct ast_tm *localsub(const struct timeval *timep, const long offset, s
 struct ast_tm *ast_localtime(const struct timeval *timep, struct ast_tm *tmp, const char *zone)
 {
 	const struct state *sp = ast_tzset(zone);
+	memset(tmp, 0, sizeof(*tmp));
 	return sp ? localsub(timep, 0L, tmp, sp) : NULL;
 }