_GetCachedImage: fix leak (fix #124), thanks @Robxley

pthom · Sep 18, 2024 · c3d46c7 · c3d46c7
1 parent 81dff9e
commit c3d46c7
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/src/hello_imgui/internal/image_from_asset.cpp b/src/hello_imgui/internal/image_from_asset.cpp
@@ -63,30 +63,34 @@ namespace HelloImGui
                 concreteImage = std::make_shared<ImageDx11>();
         #endif
         if (concreteImage == nullptr)
+        {
             HelloImGui::Log(LogLevel::Warning, "ImageFromAsset: not implemented for this rendering backend!");
-        gImageFromAssetMap[assetPath] = concreteImage;
+            gImageFromAssetMap[assetPath] = nullptr; // Cache the failure
+            return nullptr;
+        }
 
-        if (concreteImage != nullptr)
+        unsigned char* image_data_rgba;
         {
             // Load the image using stbi_load_from_memory
             auto assetData = LoadAssetFileData(assetPath);
             IM_ASSERT(assetData.data != nullptr);
-            unsigned char*image_data_rgba = stbi_load_from_memory(
+            image_data_rgba = stbi_load_from_memory(
                 (unsigned char *)assetData.data, (int)assetData.dataSize,
                 &concreteImage->Width, &concreteImage->Height, NULL, 4);
-            if (image_data_rgba == NULL)
-            {
-                IM_ASSERT(false && "_GetCachedImage: Failed to load image!");
-                throw std::runtime_error("_GetCachedImage: Failed to load image!");
-            }
             FreeAssetFileData(&assetData);
-            stbi_image_free(image_data_rgba);
-            concreteImage->_impl_StoreTexture(concreteImage->Width, concreteImage->Height, image_data_rgba);
         }
 
-        return gImageFromAssetMap.at(assetPath);
-    }
+        if (image_data_rgba == NULL)
+        {
+            IM_ASSERT(false && "_GetCachedImage: Failed to load image!");
+            throw std::runtime_error("_GetCachedImage: Failed to load image!");
+        }
+        concreteImage->_impl_StoreTexture(concreteImage->Width, concreteImage->Height, image_data_rgba);
+        stbi_image_free(image_data_rgba);
 
+        gImageFromAssetMap[assetPath] = concreteImage;
+        return concreteImage;
+    }
 
 
     void ImageFromAsset(