[pacman-dev] [PATCH] Save and restore old locale when manipulating via setlocale

[Dan McGee]

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 <dan at archlinux.org>
---
 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 f4c33a0..dc1d043 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);
 	}
 
-- 
1.8.1.5