LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-11 05:25:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

LibTimeZone: Default to UTC if parsing the TZ environment variable fails

Browse Source 
Commit c3fd455 changed LibTimeZone to fall back to the system time zone
when we fail to parse the TZ environment variable. This behavior differs
from both our LibC and glibc; they abort parsing and default to UTC.

This changes LibTimeZone to behave the same way to avoid a very awkward
situation where some parts of the codebase thinks the timezone is UTC,
and others think the timezone is whatever /etc/timezone indicates.
This commit is contained in:
Timothy Flynn 2022-10-17 12:41:19 +00:00 committed by Linus Groh
parent 6691ef5a44
commit ed612d835d
Notes: sideshowbarker 2024-07-17 07:20:57 +09:00 
Author: https://github.com/trflynn89
Commit: https://github.com/SerenityOS/serenity/commit/ed612d835d
Pull-request: https://github.com/SerenityOS/serenity/pull/15666
Reviewed-by: https://github.com/davidot ✅
Reviewed-by: https://github.com/linusg
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Tests/LibTimeZone/TestTimeZone.cpp
View File

@ -24,6 +24,26 @@ static void test_offset(StringView time_zone, i64 time, i64 expected_offset, Tim
# include <LibTimeZone/TimeZoneData.h>
class TimeZoneGuard {
public:
explicit TimeZoneGuard(char const* tz)
: m_tz(getenv("TZ"))
{
setenv("TZ", tz, 1);
}
~TimeZoneGuard()
{
if (m_tz)
setenv("TZ", m_tz, 1);
else
unsetenv("TZ");
}
private:
char const* m_tz { nullptr };
};
TEST_CASE(time_zone_from_string)
{
EXPECT_EQ(TimeZone::time_zone_from_string("America/New_York"sv), TimeZone::TimeZone::America_New_York);
@ -95,6 +115,12 @@ TEST_CASE(canonicalize_time_zone)
EXPECT(!TimeZone::canonicalize_time_zone("I don't exist"sv).has_value());
}
TEST_CASE(invalid_time_zone)
{
TimeZoneGuard guard { "ladybird" };
EXPECT_EQ(TimeZone::current_time_zone(), "UTC"sv);
}
static i64 offset(i64 sign, i64 hours, i64 minutes, i64 seconds)
{
return sign * ((hours * 3600) + (minutes * 60) + seconds);

1
Userland/Libraries/LibTimeZone/TimeZone.cpp
View File

@ -99,6 +99,7 @@ StringView current_time_zone()
return *maybe_time_zone;
dbgln_if(TIME_ZONE_DEBUG, "Could not determine time zone from TZ environment: {}", time_zone);
return "UTC"sv;
}
#ifdef AK_OS_SERENITY