From d331f8eb3f73f72a5d0223c3fe49228eec808ae3 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Fri, 20 Dec 2024 10:31:40 +0100 Subject: [PATCH] [winpr,timezone] reset timezone with tzset when iterating over timezones and reset to original call tzset again to reflect that new old timezone setting --- winpr/libwinpr/timezone/TimeZoneIanaAbbrevMap.c | 1 + winpr/libwinpr/timezone/timezone.c | 1 + 2 files changed, 2 insertions(+) diff --git a/winpr/libwinpr/timezone/TimeZoneIanaAbbrevMap.c b/winpr/libwinpr/timezone/TimeZoneIanaAbbrevMap.c index f0773f444..ca2d7d977 100644 --- a/winpr/libwinpr/timezone/TimeZoneIanaAbbrevMap.c +++ b/winpr/libwinpr/timezone/TimeZoneIanaAbbrevMap.c @@ -91,6 +91,7 @@ static void append_timezone(const char* dir, const char* name) else unsetenv("TZ"); free(tz); + tzset(); } static void handle_link(const char* base, const char* dir, const char* name); diff --git a/winpr/libwinpr/timezone/timezone.c b/winpr/libwinpr/timezone/timezone.c index 64e9c3ff4..bd71ac44f 100644 --- a/winpr/libwinpr/timezone/timezone.c +++ b/winpr/libwinpr/timezone/timezone.c @@ -899,6 +899,7 @@ DWORD EnumDynamicTimeZoneInformation(const DWORD dwIndex, else unsetenv("TZ"); free(tzcopy); + tzset(); if (local_time) dynamic_time_zone_from_localtime(local_time, lpTimeZoneInformation);