flodavid/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

time_zone_manager: Resolve sign conversion warnings

Browse source 
ttis and ats will never exceed the length of INT32_MAX in our case, so
this is safe.
This commit is contained in:
Lioncash 2020-04-16 22:23:56 -04:00
parent 79c1269f0f
commit 337f2dc11f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core/hle/service/time/time_zone_manager.cpp
View file

@ -518,8 +518,8 @@ static bool ParseTimeZoneBinary(TimeZoneRule& time_zone_rule, FileSys::VirtualFi
constexpr s32 time_zone_max_leaps{50}; constexpr s32 time_zone_max_leaps{50};
constexpr s32 time_zone_max_chars{50}; constexpr s32 time_zone_max_chars{50};
if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps && if (!(0 <= header.leap_count && header.leap_count < time_zone_max_leaps &&
0 < header.type_count && header.type_count < time_zone_rule.ttis.size() && 0 < header.type_count && header.type_count < s32(time_zone_rule.ttis.size()) &&
0 <= header.time_count && header.time_count < time_zone_rule.ats.size() && 0 <= header.time_count && header.time_count < s32(time_zone_rule.ats.size()) &&
0 <= header.char_count && header.char_count < time_zone_max_chars && 0 <= header.char_count && header.char_count < time_zone_max_chars &&
(header.ttis_std_count == header.type_count || header.ttis_std_count == 0) && (header.ttis_std_count == header.type_count || header.ttis_std_count == 0) &&
(header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) { (header.ttis_gmt_count == header.type_count || header.ttis_gmt_count == 0))) {