Merge pull request #11879 from iwubcode/texture_data_load_nolevels

VideoCommon: avoid segfault when loading a PNG with no custom texture data levels

1 files changed, 5 insertions, 2 deletions

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 {};