Artic Base: Fix issue when 0 bytes are read from file (#199)

PabloMK7 · Jul 17, 2024 · 518f723 · 518f723
1 parent 959a66d
commit 518f723
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/core/file_sys/archive_artic.cpp b/src/core/file_sys/archive_artic.cpp
@@ -405,11 +405,12 @@ ResultVal<std::size_t> ArticFileBackend::Read(u64 offset, std::size_t length, u8
             return res;
 
         auto read_buff = resp->GetResponseBuffer(0);
-        if (!read_buff.has_value())
-            return Result(-1);
-        size_t actually_read = read_buff->second;
+        size_t actually_read = 0;
+        if (read_buff.has_value()) {
+            actually_read = read_buff->second;
+            memcpy(buffer + read_amount, read_buff->first, actually_read);
+        }
 
-        memcpy(buffer + read_amount, read_buff->first, actually_read);
         read_amount += actually_read;
         if (actually_read != to_read)
             break;

diff --git a/src/core/file_sys/artic_cache.cpp b/src/core/file_sys/artic_cache.cpp
@@ -200,11 +200,12 @@ ResultVal<size_t> ArticCache::ReadFromArtic(s32 file_handle, u8* buffer, size_t
             return res;
 
         auto read_buff = resp->GetResponseBuffer(0);
-        if (!read_buff.has_value())
-            return Result(-1);
-        size_t actually_read = read_buff->second;
+        size_t actually_read = 0;
+        if (read_buff.has_value()) {
+            actually_read = read_buff->second;
+            memcpy(buffer + read_amount, read_buff->first, actually_read);
+        }
 
-        memcpy(buffer + read_amount, read_buff->first, actually_read);
         read_amount += actually_read;
         if (actually_read != to_read)
             break;