Common: Fix bgfx crash when there is not enough RAM available

julianxhokaxhiu · Nov 19, 2024 · 28ba54a · 28ba54a
1 parent e814c15
commit 28ba54a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/Changelog.md b/Changelog.md
@@ -4,6 +4,7 @@
 
 ## Common
 
+- Core: Fix bgfx crash when memory cannot be allocated ( https://github.com/julianxhokaxhiu/FFNx/pull/755 )
 - Voice: Add support for `config.toml` configuration override based on Game Moment ID
 
 ## FF8

diff --git a/src/renderer.cpp b/src/renderer.cpp
@@ -1840,7 +1840,11 @@ uint32_t Renderer::createTexture(uint8_t* data, size_t width, size_t height, int
 
         if (copyData)
         {
-            mem = bgfx::copy(data, texInfo.storageSize);
+            mem = bgfx::alloc(texInfo.storageSize);
+            // Protect from crashes
+            if (mem != NULL) {
+                bx::memCopy(mem->data, data, texInfo.storageSize);
+            }
         }
         else
         {