Fix inverted null check in time_zone_name_win.cc#340
Open
yukawa wants to merge 1 commit intogoogle:masterfrom
Open
Fix inverted null check in time_zone_name_win.cc#340yukawa wants to merge 1 commit intogoogle:masterfrom
time_zone_name_win.cc#340yukawa wants to merge 1 commit intogoogle:masterfrom
Conversation
devbww
reviewed
Mar 22, 2026
| AsProcAddress<ucal_getTimeZoneIDForWindowsID_func>( | ||
| icu_dll, "ucal_getTimeZoneIDForWindowsID"); | ||
| if (ucal_getTimeZoneIDForWindowsIDRef != nullptr) { | ||
| if (ucal_getTimeZoneIDForWindowsIDRef == nullptr) { |
Contributor
There was a problem hiding this comment.
I'm fine with the change, of course, but it does seem to indicate that we don't have anything that tests whether GetWindowsLocalTimeZone() works.
Contributor
Author
There was a problem hiding this comment.
Right. The existing fallback chain in local_time_zone() makes it difficult for the test to actually fail. I've added a dedicated unit test in cbbfd28. Does it make sense?
yukawa
force-pushed
the
fix_icu_load_null_check
branch
2 times, most recently
from
e33561c to
cbbfd28
Compare
devbww
reviewed
Mar 23, 2026
CMakeLists.txt
Outdated
Comment on lines
+164
to
+167
| set(CCTZ_TESTS civil_time_test time_zone_format_test time_zone_lookup_test) | ||
| if(WIN32) | ||
| list(APPEND CCTZ_TESTS time_zone_name_win_test) | ||
| endif() |
Contributor
There was a problem hiding this comment.
Perhaps separate list(APPEND CCTZ_TESTS ...) calls would be best factored out to after the corresponding add_test() calls? That would make each block its own separate unit, and remove the need for the extra if(WIN32) conditional.
yukawa
force-pushed
the
fix_icu_load_null_check
branch
from
cbbfd28 to
841a08a
Compare
devbww
reviewed
Mar 23, 2026
src/time_zone_name_win_test.cc
Outdated
| HMODULE icu_dll = | ||
| ::LoadLibraryExW(L"icu.dll", nullptr, LOAD_LIBRARY_SEARCH_SYSTEM32); | ||
| if (icu_dll != nullptr) { | ||
| const std::string tz = GetWindowsLocalTimeZone(); |
Contributor
There was a problem hiding this comment.
Perhaps factor this repeated statement out of the conditional.
This commit follows up the previous commit [1], which aimed to improve the code but ended up introducing an inverted null check in time_zone_name_win.cc. As a result, LoadIcuGetTimeZoneIDForWindowsID() currently returns nullptr when it should be returning a valid time zone ID. A unit test is also added, as the fallback chain in local_time_zone() makes it difficult to verify the behavior of LoadIcuGetTimeZoneIDForWindowsID() in isolation. The test ensures that the function correctly returns a valid time zone ID on Windows. This is also a preparation for implementing TimeZoneIf with Windows time APIs (google#328). [1] 27ca173
yukawa
force-pushed
the
fix_icu_load_null_check
branch
from
841a08a to
d09a3fd
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit follows up the previous commit (27ca173), which aimed to improve the code but ended up introducing an inverted null check in time_zone_name_win.cc. As a result,
LoadIcuGetTimeZoneIDForWindowsID()currently returnsnullptrwhen it should be returning a valid time zone ID.This is also a preparation for implementing TimeZoneIf with Windows time APIs (#328).