summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGravatar Lioncash2020-04-16 22:23:56 -0400
committerGravatar Lioncash2020-04-16 22:23:59 -0400
commit337f2dc11fefba337020e1b8d16e8a62cbdfa8a2 (patch)
tree90c5865df8a28cf56b3f92c08ee2711eaad3c04c /src
parentMerge pull request #3673 from lioncash/extra (diff)
downloadyuzu-337f2dc11fefba337020e1b8d16e8a62cbdfa8a2.tar.gz
yuzu-337f2dc11fefba337020e1b8d16e8a62cbdfa8a2.tar.xz
yuzu-337f2dc11fefba337020e1b8d16e8a62cbdfa8a2.zip
time_zone_manager: Resolve sign conversion warnings
ttis and ats will never exceed the length of INT32_MAX in our case, so this is safe.
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/time/time_zone_manager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/time/time_zone_manager.cpp b/src/core/hle/service/time/time_zone_manager.cpp
index c8159bcd5..69152d0ac 100644
--- a/src/core/hle/service/time/time_zone_manager.cpp
+++ b/src/core/hle/service/time/time_zone_manager.cpp
@@ -518,8 +518,8 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
518 constexpr s32 time_zone_max_leaps{50}; 518 constexpr s32 time_zone_max_leaps{50};
519 constexpr s32 time_zone_max_chars{50}; 519 constexpr s32 time_zone_max_chars{50};
520 if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps && 520 if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps &&
521 0 < header.type_count && header.type_count < time_zone_rule.ttis.size() && 521 0 < header.type_count && header.type_count < s32(time_zone_rule.ttis.size()) &&
522 0 <= header.time_count && header.time_count < time_zone_rule.ats.size() && 522 0 <= header.time_count && header.time_count < s32(time_zone_rule.ats.size()) &&
523 0 <= header.char_count && header.char_count < time_zone_max_chars && 523 0 <= header.char_count && header.char_count < time_zone_max_chars &&
524 (header.ttis_std_count == header.type_count || header.ttis_std_count == 0) && 524 (header.ttis_std_count == header.type_count || header.ttis_std_count == 0) &&
525 (header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) { 525 (header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) {