Merge branch '2.6.x' into master

Author: eXpl0it3r

examples/netcore/netcore.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    <Version>2.6.0</Version>
+    <Version>2.6.1</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
 

examples/visualbasic/visualbasic.vbproj

@@ -8,7 +8,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
-    <Version>2.6.0</Version>
+    <Version>2.6.1</Version>
     <Platforms>AnyCPU;x64;x86</Platforms>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

src/SFML.Audio/Music.cs

@@ -49,8 +49,10 @@ public Music(string filename) :
         public Music(Stream stream) :
             base(IntPtr.Zero)
         {
-            _stream = new StreamAdaptor(stream);
-            CPointer = sfMusic_createFromStream(_stream.InputStreamPtr);
+            // Stream needs to stay alive as long as the Music instance is alive
+            // Disposing of it can only be done in Music's Dispose method
+            myStream = new StreamAdaptor(stream);
+            CPointer = sfMusic_createFromStream(myStream.InputStreamPtr);
 
             if (IsInvalid)
             {
@@ -74,16 +76,14 @@ public Music(Stream stream) :
         public Music(byte[] bytes) :
             base(IntPtr.Zero)
         {
-            unsafe
-            {
-                fixed (void* ptr = bytes)
-                {
-                    CPointer = sfMusic_createFromMemory((IntPtr)ptr, (UIntPtr)bytes.Length);
-                }
-            }
+            // Memory needs to stay pinned as long as the Music instance is alive
+            // Freeing the handle can only be done in Music's Dispose method
+            myBytesPin = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+            CPointer = sfMusic_createFromMemory(myBytesPin.AddrOfPinnedObject(), (UIntPtr)bytes.Length);
 
             if (IsInvalid)
             {
+                myBytesPin.Free();
                 throw new LoadingFailedException("music");
             }
         }
@@ -552,13 +552,22 @@ protected override void Destroy(bool disposing)
         {
             if (disposing)
             {
-                _stream?.Dispose();
+                if (myStream != null)
+                {
+                    myStream.Dispose();
+                }
+            }
+
+            if (myBytesPin.IsAllocated)
+            {
+                myBytesPin.Free();
             }
 
             sfMusic_destroy(CPointer);
         }
 
-        private readonly StreamAdaptor _stream;
+        private StreamAdaptor myStream = null;
+        private GCHandle myBytesPin;
         private EffectProcessorInternal _effectProcessor;
 
         /// <summary>

src/SFML.Graphics/Font.cs

@@ -41,10 +41,10 @@ public Font(string filename) : base(sfFont_createFromFile(filename))
         ////////////////////////////////////////////////////////////
         public Font(Stream stream) : base(IntPtr.Zero)
         {
-            using (var adaptor = new StreamAdaptor(stream))
-            {
-                CPointer = sfFont_createFromStream(adaptor.InputStreamPtr);
-            }
+            // Stream needs to stay alive as long as the Font instance is alive
+            // Disposing of it can only be done in Font's Dispose method
+            myStream = new StreamAdaptor(stream);
+            CPointer = sfFont_createFromStream(myStream.InputStreamPtr);
 
             if (IsInvalid)
             {
@@ -62,16 +62,14 @@ public Font(Stream stream) : base(IntPtr.Zero)
         public Font(byte[] bytes) :
             base(IntPtr.Zero)
         {
-            unsafe
-            {
-                fixed (void* ptr = bytes)
-                {
-                    CPointer = sfFont_createFromMemory((IntPtr)ptr, (UIntPtr)bytes.Length);
-                }
-            }
+            // Memory needs to stay pinned as long as the Font instance is alive
+            // Freeing the handle can only be done in Font's Dispose method
+            myBytesPin = GCHandle.Alloc(bytes, GCHandleType.Pinned);
+            CPointer = sfFont_createFromMemory(myBytesPin.AddrOfPinnedObject(), (UIntPtr)bytes.Length);
 
             if (IsInvalid)
             {
+                myBytesPin.Free();
                 throw new LoadingFailedException("font");
             }
         }
@@ -245,6 +243,16 @@ protected override void Destroy(bool disposing)
                 {
                     texture.Dispose();
                 }
+
+                if (myStream != null)
+                {
+                    myStream.Dispose();
+                }
+            }
+
+            if (myBytesPin.IsAllocated)
+            {
+                myBytesPin.Free();
             }
 
             if (!disposing)
@@ -285,6 +293,8 @@ internal struct InfoMarshalData
         }
 
         private readonly Dictionary<uint, Texture> _textures = new Dictionary<uint, Texture>();
+        private SFML.System.StreamAdaptor myStream = null;
+        private GCHandle myBytesPin;
 
         #region Imports
         [DllImport(CSFML.Graphics, CallingConvention = CallingConvention.Cdecl), SuppressUnmanagedCodeSecurity]