N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Replace &vec[0] with vec.data()

Browse source 
When the vector is empty, using `&vec[0]` involves undefined behaviour. While that works fine most of the time, Flatpak builds aborted on a failed `__builtin_expect`.

I searched for such occurences across the codebase with the regex `(?<!&)&\w+\[0\]` and fixed those that would potentially cause issues.
This commit is contained in:
Pengfei 2021-07-14 17:01:14 +08:00
parent 5241032fc5
commit f85bde3ca3
No known key found for this signature in database
GPG key ID: DD129E108BD09378
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/file_util.cpp
View file

@ -784,7 +784,7 @@ std::size_t ReadFileToString(bool text_file, const std::string& filename, std::s
return 0; return 0;
str.resize(static_cast<u32>(file.GetSize())); str.resize(static_cast<u32>(file.GetSize()));
return file.ReadArray(&str[0], str.size()); return file.ReadArray(str.data(), str.size());
} }
void SplitFilename83(const std::string& filename, std::array<char, 9>& short_name, void SplitFilename83(const std::string& filename, std::array<char, 9>& short_name,

9
src/core/file_sys/ncch_container.cpp
View file

@ -554,15 +554,16 @@ Loader::ResultStatus NCCHContainer::LoadSectionExeFS(const char* name, std::vect
// Decompress .code section... // Decompress .code section...
u32 decompressed_size = LZSS_GetDecompressedSize(&temp_buffer[0], section.size); u32 decompressed_size = LZSS_GetDecompressedSize(&temp_buffer[0], section.size);
buffer.resize(decompressed_size); buffer.resize(decompressed_size);
if (!LZSS_Decompress(&temp_buffer[0], section.size, &buffer[0], decompressed_size)) if (!LZSS_Decompress(&temp_buffer[0], section.size, buffer.data(),
decompressed_size))
return Loader::ResultStatus::ErrorInvalidFormat; return Loader::ResultStatus::ErrorInvalidFormat;
} else { } else {
// Section is uncompressed... // Section is uncompressed...
buffer.resize(section.size); buffer.resize(section.size);
if (exefs_file.ReadBytes(&buffer[0], section.size) != section.size) if (exefs_file.ReadBytes(buffer.data(), section.size) != section.size)
return Loader::ResultStatus::Error; return Loader::ResultStatus::Error;
if (is_encrypted) { if (is_encrypted) {
dec.ProcessData(&buffer[0], &buffer[0], section.size); dec.ProcessData(buffer.data(), buffer.data(), section.size);
} }
} }
@ -641,7 +642,7 @@ Loader::ResultStatus NCCHContainer::LoadOverrideExeFSSection(const char* name,
buffer.resize(section_size); buffer.resize(section_size);
section_file.Seek(0, SEEK_SET); section_file.Seek(0, SEEK_SET);
if (section_file.ReadBytes(&buffer[0], section_size) == section_size) { if (section_file.ReadBytes(buffer.data(), section_size) == section_size) {
LOG_WARNING(Service_FS, "File {} overriding built-in ExeFS file", path); LOG_WARNING(Service_FS, "File {} overriding built-in ExeFS file", path);
return Loader::ResultStatus::Success; return Loader::ResultStatus::Success;
} }

2
src/core/loader/3dsx.cpp
View file

@ -342,7 +342,7 @@ ResultStatus AppLoader_THREEDSX::ReadIcon(std::vector<u8>& buffer) {
file.Seek(hdr.smdh_offset, SEEK_SET); file.Seek(hdr.smdh_offset, SEEK_SET);
buffer.resize(hdr.smdh_size); buffer.resize(hdr.smdh_size);
if (file.ReadBytes(&buffer[0], hdr.smdh_size) != hdr.smdh_size) if (file.ReadBytes(buffer.data(), hdr.smdh_size) != hdr.smdh_size)
return ResultStatus::Error; return ResultStatus::Error;
return ResultStatus::Success; return ResultStatus::Success;