From 163c36bdcde6aa324060bafe5674ea83cf556fd8 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Sun, 10 Mar 2013 23:01:55 -0500 Subject: Save and restore old locale when manipulating via setlocale We shouldn't assume a frontend program didn't explicitly set the LC_TIME setting to a value not in the environment, which is what we previously assumed. Save the old locale before forcing the 'C' locale and restore it when we are done. Signed-off-by: Dan McGee Signed-off-by: Allan McRae --- lib/libalpm/util.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/libalpm/util.c b/lib/libalpm/util.c index f4c33a0d..dc1d0435 100644 --- a/lib/libalpm/util.c +++ b/lib/libalpm/util.c @@ -1170,12 +1170,16 @@ alpm_time_t _alpm_parsedate(const char *line) errno = 0; if(isalpha((unsigned char)line[0])) { + const char *oldlocale; /* initialize to null in case of failure */ struct tm tmp_tm; memset(&tmp_tm, 0, sizeof(struct tm)); + + oldlocale = setlocale(LC_TIME, NULL); setlocale(LC_TIME, "C"); strptime(line, "%a %b %e %H:%M:%S %Y", &tmp_tm); - setlocale(LC_TIME, ""); + setlocale(LC_TIME, oldlocale); + return (alpm_time_t)mktime(&tmp_tm); } -- cgit v1.2.3-70-g09d2