[PixImage] Fix leak in Windows Media loader

Trying to load a file directly leads to a handle leak in case of failure. Reproducible in PGM loader test.
aardvark-platform · Oct 18, 2023 · 05021b8 · 05021b8
1 parent b159a19
commit 05021b8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Aardvark.PixImage.WindowsMedia/PixImageWindowsMedia.cs b/src/Aardvark.PixImage.WindowsMedia/PixImageWindowsMedia.cs
@@ -240,12 +240,13 @@ private class PixLoader : IPixLoader
             /// </summary>
             public PixImage LoadFromFile(string filename)
             {
+                using var stream = new MemoryStream(File.ReadAllBytes(filename));
+
                 var bitmapImage = new BitmapImage();
                 bitmapImage.BeginInit();
-                bitmapImage.UriSource = new Uri(filename, UriKind.RelativeOrAbsolute);
+                bitmapImage.StreamSource = stream;
                 bitmapImage.CacheOption = BitmapCacheOption.OnLoad;
-                bitmapImage.CreateOptions = BitmapCreateOptions.None
-                                     | BitmapCreateOptions.PreservePixelFormat;
+                bitmapImage.CreateOptions = BitmapCreateOptions.PreservePixelFormat;
                 bitmapImage.EndInit();
                 return CreateFromBitmapSource(bitmapImage);
             }