From af55f4cf9eff92d3e15c5828f4f2674d59dfad8c Mon Sep 17 00:00:00 2001 From: djcb Date: Sat, 7 Sep 2013 13:12:28 +0300 Subject: [PATCH] * update mu_date_str_to_time_t for macos at macos this function /seemed/ to massively leak, when looking at the valgrind output on macos (but not linux). with this update, this leak(?) is gone. --- lib/mu-date.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/mu-date.c b/lib/mu-date.c index c8ae3803..9c749b84 100644 --- a/lib/mu-date.c +++ b/lib/mu-date.c @@ -223,13 +223,14 @@ time_t mu_date_str_to_time_t (const char* date, gboolean local) { struct tm tm; - char mydate[14 + 1]; /* YYYYMMDDHHMMSS */ + char tzbuf[16], mydate[14 + 1]; /* YYYYMMDDHHMMSS */ + char *oldtz; time_t t; - char oldtz[16]; memset (&tm, 0, sizeof(struct tm)); strncpy (mydate, date, 15); mydate[sizeof(mydate)-1]='\0'; + oldtz = tzbuf; g_return_val_if_fail (date, (time_t)-1); @@ -249,8 +250,9 @@ mu_date_str_to_time_t (const char* date, gboolean local) setenv ("TZ", "", 1); tzset (); } else - local = TRUE; /* already */ - } + oldtz = NULL; + } else + oldtz = NULL; t = mktime (&tm);