Jelajahi Sumber

Merge pull request #10863 from lat9nq/tz-end-of-string

time_zone_manager: Stop on comma
bunnei 3 tahun lalu
induk
melakukan
8ad64bc253
1 mengubah file dengan 5 tambahan dan 1 penghapusan
  1. 5 1
      src/core/hle/service/time/time_zone_manager.cpp

+ 5 - 1
src/core/hle/service/time/time_zone_manager.cpp

@@ -911,9 +911,13 @@ static Result ToCalendarTimeInternal(const TimeZoneRule& rules, s64 time,
 
     calendar_additional_info.is_dst = rules.ttis[tti_index].is_dst;
     const char* time_zone{&rules.chars[rules.ttis[tti_index].abbreviation_list_index]};
-    for (int index{}; time_zone[index] != '\0'; ++index) {
+    u32 index;
+    for (index = 0; time_zone[index] != '\0' && time_zone[index] != ',' &&
+                    index < calendar_additional_info.timezone_name.size() - 1;
+         ++index) {
         calendar_additional_info.timezone_name[index] = time_zone[index];
     }
+    calendar_additional_info.timezone_name[index] = '\0';
     return ResultSuccess;
 }