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 3a99622c3351ed9c8c0f0e3aceef20793cb5ad06..54285c298db6fd6017630ea281e0208619f08d87 100644 (file)
--- 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 94513ae762de8ea9dfe8ee8c7b95729b9a2d456a..af8fe391d57769febc0f6b21ac730db612c6665a 100644 (file)
--- 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;
 }