aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-17 20:16:25 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-09-17 20:16:25 +0000
commit9e5a60c4ea77bbe8ae7ca9d77f16b99d11ad6bc0 (patch)
tree7e28fce755f662e6ecead5adf07730215a554901
parent07e503d2075c10e6a2e9713cee404db1af21e61d (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@82676 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--apps/app_voicemail.c3
-rw-r--r--main/stdtime/localtime.c1
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index d3d29e606..fe55a5019 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1783,8 +1783,6 @@ static void make_email_file(FILE *p, char *srcemail, struct ast_vm_user *vmu, in
#define ENDL "\n"
#endif
- memset(&tm, 0, sizeof(tm));
-
gethostname(host, sizeof(host) - 1);
if (strchr(srcemail, '@'))
ast_copy_string(who, srcemail, sizeof(who));
@@ -2053,7 +2051,6 @@ static int get_date(char *s, int len)
time_t t;
time(&t);
- memset(&tm, 0, sizeof(tm));
ast_localtime(&t, &tm, NULL);
diff --git a/main/stdtime/localtime.c b/main/stdtime/localtime.c
index 9ecfa0a70..1922e4a22 100644
--- a/main/stdtime/localtime.c
+++ b/main/stdtime/localtime.c
@@ -1142,6 +1142,7 @@ static struct tm *localsub(const time_t *timep, const long offset, struct tm *tm
struct tm *ast_localtime(const time_t *timep, struct 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;
}