diff --git a/src/core/loader/nro.cpp b/src/core/loader/nro.cpp index a007d3e6e5..465b827bb0 100644 --- a/src/core/loader/nro.cpp +++ b/src/core/loader/nro.cpp @@ -82,7 +82,7 @@ bool AppLoader_NRO::LoadNro(FileSys::VirtualFile file, VAddr load_base) { if (program_image.size() != PageAlignSize(nro_header.file_size)) return {}; - for (int i = 0; i < nro_header.segments.size(); ++i) { + for (std::size_t i = 0; i < nro_header.segments.size(); ++i) { codeset->segments[i].addr = nro_header.segments[i].offset; codeset->segments[i].offset = nro_header.segments[i].offset; codeset->segments[i].size = PageAlignSize(nro_header.segments[i].size); diff --git a/src/core/loader/nso.cpp b/src/core/loader/nso.cpp index 2beb85fbf4..f7752e0e35 100644 --- a/src/core/loader/nso.cpp +++ b/src/core/loader/nso.cpp @@ -66,8 +66,7 @@ FileType AppLoader_NSO::IdentifyType(const FileSys::VirtualFile& file) { static std::vector DecompressSegment(const std::vector& compressed_data, const NsoSegmentHeader& header) { - std::vector uncompressed_data; - uncompressed_data.resize(header.size); + std::vector uncompressed_data(header.size); const int bytes_uncompressed = LZ4_decompress_safe( reinterpret_cast(compressed_data.data()), reinterpret_cast(uncompressed_data.data()), compressed_data.size(), header.size); @@ -80,8 +79,7 @@ static std::vector DecompressSegment(const std::vector& compressed_data, static std::vector ReadSegment(FileUtil::IOFile& file, const NsoSegmentHeader& header, size_t compressed_size) { - std::vector compressed_data; - compressed_data.resize(compressed_size); + std::vector compressed_data(compressed_size); file.Seek(header.offset, SEEK_SET); if (compressed_size != file.ReadBytes(compressed_data.data(), compressed_size)) { @@ -113,7 +111,7 @@ VAddr AppLoader_NSO::LoadModule(FileSys::VirtualFile file, VAddr load_base) { // Build program image Kernel::SharedPtr codeset = Kernel::CodeSet::Create(""); std::vector program_image; - for (int i = 0; i < nso_header.segments.size(); ++i) { + for (std::size_t i = 0; i < nso_header.segments.size(); ++i) { const std::vector compressed_data = file->ReadBytes(nso_header.segments_compressed_size[i], nso_header.segments[i].offset); std::vector data = DecompressSegment(compressed_data, nso_header.segments[i]);