From 47c40d51dffe646465bb5bb8454c6143005859da Mon Sep 17 00:00:00 2001 From: iwubcode Date: Fri, 2 Jun 2023 22:02:37 -0500 Subject: VideoCommon: when loading a PNG with no custom texture data levels already, create a level, this avoids a potential segfault --- Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp') diff --git a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp index 912def9e6b..f65ea9ccc9 100644 --- a/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp +++ b/Source/Core/VideoCommon/Assets/DirectFilesystemAssetLibrary.cpp @@ -72,8 +72,11 @@ CustomAssetLibrary::LoadInfo DirectFilesystemAssetLibrary::LoadTexture(const Ass } else if (ext == ".png") { - LoadPNGTexture(data, asset_path.string()); - if (data->m_levels.empty()) [[unlikely]] + // If we have no levels, create one to pass into LoadPNGTexture + if (data->m_levels.empty()) + data->m_levels.push_back({}); + + if (!LoadPNGTexture(&data->m_levels[0], asset_path.string())) return {}; if (!LoadMips(asset_path, data)) return {}; -- cgit v1.2.3