Android 205

device_memory_manager: fix ScratchBuffer indexing

README.md

@@ -1,6 +1,6 @@
 | Pull Request | Commit | Title | Author | Merged? |
 |----|----|----|----|----|
-| [12499](https://github.com/yuzu-emu/yuzu-android//pull/12499) | [`31f015adc`](https://github.com/yuzu-emu/yuzu-android//pull/12499/files) | Rework time services | [Kelebek1](https://github.com/Kelebek1/) | Yes |
+| [12499](https://github.com/yuzu-emu/yuzu-android//pull/12499) | [`fc30a84fc`](https://github.com/yuzu-emu/yuzu-android//pull/12499/files) | Rework time services | [Kelebek1](https://github.com/Kelebek1/) | Yes |
 | [12749](https://github.com/yuzu-emu/yuzu-android//pull/12749) | [`e3171486d`](https://github.com/yuzu-emu/yuzu-android//pull/12749/files) | general: workarounds for SMMU syncing issues | [liamwhite](https://github.com/liamwhite/) | Yes |
 
 

src/core/device_memory_manager.inc

@@ -31,9 +31,8 @@ public:
         buffer.resize(0);
         size_t index = 0;
         const auto add_value = [&](u32 value) {
-            buffer[index] = value;
-            index++;
-            buffer.resize(index);
+            buffer.resize(index + 1);
+            buffer[index++] = value;
         };
 
         u32 iter_entry = start_entry;

src/core/file_sys/system_archive/system_archive.cpp

@@ -67,25 +67,29 @@ constexpr std::array<SystemArchiveDescriptor, SYSTEM_ARCHIVE_COUNT> SYSTEM_ARCHI
 }};
 
 VirtualFile SynthesizeSystemArchive(const u64 title_id) {
-    if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id)
+    if (title_id < SYSTEM_ARCHIVES.front().title_id || title_id > SYSTEM_ARCHIVES.back().title_id) {
         return nullptr;
+    }
 
     const auto& desc = SYSTEM_ARCHIVES[title_id - SYSTEM_ARCHIVE_BASE_TITLE_ID];
 
     LOG_INFO(Service_FS, "Synthesizing system archive '{}' (0x{:016X}).", desc.name, desc.title_id);
 
-    if (desc.supplier == nullptr)
+    if (desc.supplier == nullptr) {
         return nullptr;
+    }
 
     const auto dir = desc.supplier();
 
-    if (dir == nullptr)
+    if (dir == nullptr) {
         return nullptr;
+    }
 
     const auto romfs = CreateRomFS(dir);
 
-    if (romfs == nullptr)
+    if (romfs == nullptr) {
         return nullptr;
+    }
 
     LOG_INFO(Service_FS, "    - System archive generation successful!");
     return romfs;

src/core/hle/service/glue/time/manager.cpp

@@ -89,7 +89,8 @@ Service::PSC::Time::LocationName GetTimeZoneString(Service::PSC::Time::LocationN
                     std::min(configured_name.name.size(), configured_zone.size()));
     }
 
-    ASSERT_MSG(IsTimeZoneBinaryValid(configured_name), "Invalid time zone!");
+    ASSERT_MSG(IsTimeZoneBinaryValid(configured_name), "Invalid time zone {}!",
+               configured_name.name.data());
 
     return configured_name;
 }

src/core/hle/service/glue/time/time_zone_binary.cpp

@@ -61,6 +61,16 @@ Result MountTimeZoneBinary(Core::System& system) {
         g_time_zone_binary_romfs = FileSys::ExtractRomFS(nca->GetRomFS());
     }
 
+    if (g_time_zone_binary_romfs) {
+        // Validate that the romfs is readable, using invalid firmware keys can cause this to get
+        // set but the files to be garbage. In that case, we want to hit the next path and
+        // synthesise them instead.
+        Service::PSC::Time::LocationName name{"Etc/GMT"};
+        if (!IsTimeZoneBinaryValid(name)) {
+            ResetTimeZoneBinary();
+        }
+    }
+
     if (!g_time_zone_binary_romfs) {
         g_time_zone_binary_romfs = FileSys::ExtractRomFS(
             FileSys::SystemArchive::SynthesizeSystemArchive(TimeZoneBinaryId));
@@ -102,6 +112,7 @@ bool IsTimeZoneBinaryValid(Service::PSC::Time::LocationName& name) {
 
     auto vfs_file{g_time_zone_binary_romfs->GetFileRelative(path)};
     if (!vfs_file) {
+        LOG_INFO(Service_Time, "Could not find timezone file {}", path);
         return false;
     }
     return vfs_file->GetSize() != 0;