Fix crash when disposing MediaStream. (#114)

radek-k · Apr 25, 2022 · 4dffe1e · 4dffe1e
1 parent f9be15c
commit 4dffe1e
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 5 deletions.
diff --git a/FFMediaToolkit/Decoding/AudioStream.cs b/FFMediaToolkit/Decoding/AudioStream.cs
@@ -13,6 +13,7 @@
  public unsafe class AudioStream : MediaStream
  {
  private SwrContext* swrContext;
+ private bool isDisposed;
 
  /// <summary>
  /// Initializes a new instance of the <see cref="AudioStream"/> class.
@@ -132,9 +133,14 @@ public bool TryGetFrame(TimeSpan time, out AudioData data)
  /// <inheritdoc/>
  public override void Dispose()
  {
- fixed (SwrContext** ptr = &swrContext)
+ if (!isDisposed)
  {
- ffmpeg.swr_free(ptr);
+ fixed (SwrContext** ptr = &swrContext)
+ {
+ ffmpeg.swr_free(ptr);
+ }
+
+ isDisposed = true;
  }
 
  base.Dispose();

diff --git a/FFMediaToolkit/Decoding/MediaStream.cs b/FFMediaToolkit/Decoding/MediaStream.cs
@@ -10,6 +10,8 @@
  /// </summary>
  public class MediaStream : IDisposable
  {
+ private bool isDisposed;
+
  /// <summary>
  /// Initializes a new instance of the <see cref="MediaStream"/> class.
  /// </summary>
@@ -56,8 +58,12 @@ internal MediaStream(Decoder stream, MediaOptions options)
  /// <inheritdoc/>
  public virtual void Dispose()
  {
- Stream.DiscardBufferedData();
- Stream.Dispose();
+ if (!isDisposed)
+ {
+ Stream.DiscardBufferedData();
+ Stream.Dispose();
+ isDisposed = true;
+ }
  }
 
  /// <summary>

diff --git a/FFMediaToolkit/Decoding/VideoStream.cs b/FFMediaToolkit/Decoding/VideoStream.cs
@@ -16,6 +16,7 @@ public class VideoStream : MediaStream
  private readonly int outputFrameStride;
  private readonly int requiredBufferSize;
  private readonly ImageConverter converter;
+ private bool isDisposed;
 
  /// <summary>
  /// Initializes a new instance of the <see cref="VideoStream"/> class.
@@ -232,7 +233,12 @@ public unsafe bool TryGetFrame(TimeSpan time, IntPtr buffer, int bufferStride)
  /// <inheritdoc/>
  public override void Dispose()
  {
- converter.Dispose();
+ if (!isDisposed)
+ {
+ converter.Dispose();
+ isDisposed = true;
+ }
+
  base.Dispose();
  }