ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11879 from iwubcode/texture_data_load_nolevels 

VideoCommon: avoid segfault when loading a PNG with no custom texture data levels
This commit is contained in:
Admiral H. Curtiss 2023-06-03 19:35:48 +02:00 committed by GitHub
parent 0b3d28abaf 47c40d51df
commit 80bf175c48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/VideoCommon/Assets/CustomTextureData.cpp
View File

@ -515,11 +515,6 @@ bool LoadDDSTexture(CustomTextureData::Level* level, const std::string& filename
info.first_mip_row_length, info.first_mip_size); info.first_mip_row_length, info.first_mip_size);
} }
bool LoadPNGTexture(CustomTextureData* texture, const std::string& filename)
{
return LoadPNGTexture(&texture->m_levels[0], filename);
}
bool LoadPNGTexture(CustomTextureData::Level* level, const std::string& filename) bool LoadPNGTexture(CustomTextureData::Level* level, const std::string& filename)
{ {
if (!level) [[unlikely]] if (!level) [[unlikely]]

1
Source/Core/VideoCommon/Assets/CustomTextureData.h
View File

@ -27,6 +27,5 @@ public:
bool LoadDDSTexture(CustomTextureData* texture, const std::string& filename); bool LoadDDSTexture(CustomTextureData* texture, const std::string& filename);
bool LoadDDSTexture(CustomTextureData::Level* level, const std::string& filename, u32 mip_level); bool LoadDDSTexture(CustomTextureData::Level* level, const std::string& filename, u32 mip_level);
bool LoadPNGTexture(CustomTextureData* texture, const std::string& filename);
bool LoadPNGTexture(CustomTextureData::Level* level, const std::string& filename); bool LoadPNGTexture(CustomTextureData::Level* level, const std::string& filename);
} // namespace VideoCommon } // namespace VideoCommon

7
Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp
View File

@ -72,8 +72,11 @@ CustomAssetLibrary::LoadInfo DirectFilesystemAssetLibrary::LoadTexture(const Ass
} }
else if (ext == ".png") else if (ext == ".png")
{ {
LoadPNGTexture(data, asset_path.string()); // If we have no levels, create one to pass into LoadPNGTexture
if (data->m_levels.empty()) [[unlikely]] if (data->m_levels.empty())
data->m_levels.push_back({});
if (!LoadPNGTexture(&data->m_levels[0], asset_path.string()))
return {}; return {};
if (!LoadMips(asset_path, data)) if (!LoadMips(asset_path, data))
return {}; return {};