Merge pull request naudio#124 from stanhuff/audiofilereader_fix

AudioFileReader NullReferenceException fix in Dispose
StevilKnevil · Oct 2, 2016 · 7753f3a · 7753f3a
2 parents 81e91c4 + 0527dc0
commit 7753f3a
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/NAudio/Wave/WaveStreams/AudioFileReader.cs b/NAudio/Wave/WaveStreams/AudioFileReader.cs
@@ -156,8 +156,10 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                readerStream.Dispose();
-                readerStream = null;
+                if (readerStream != null) {
+                    readerStream.Dispose();
+                    readerStream = null;
+                }
             }
             base.Dispose(disposing);
         }

diff --git a/NAudioTests/NAudioTests.csproj b/NAudioTests/NAudioTests.csproj
@@ -107,6 +107,7 @@
     <Compile Include="Wasapi\MMDeviceEnumeratorTests.cs" />
     <Compile Include="WaveFormats\AdpcmWaveFormatTests.cs" />
     <Compile Include="WaveIn\WaveInDevicesTests.cs" />
+    <Compile Include="WaveStreams\AudioFileReaderTests.cs" />
     <Compile Include="WaveStreams\BlockAlignmentReductionStreamTests.cs" />
     <Compile Include="WaveStreams\BufferedWaveProviderTests.cs" />
     <Compile Include="WaveStreams\CircularBufferTests.cs" />

diff --git a/NAudioTests/WaveStreams/AudioFileReaderTests.cs b/NAudioTests/WaveStreams/AudioFileReaderTests.cs
@@ -0,0 +1,18 @@
+using NAudio.Wave;
+using NUnit.Framework;
+
+namespace NAudioTests.WaveStreams
+{
+    [TestFixture]
+    public class AudioFileReaderTests
+    {
+        [Test]
+        [Category("IntegrationTest")]
+        public void CanBeDisposedMoreThanOnce()
+        {
+            var reader = new AudioFileReader(@"..\..\..\SampleData\Drums\closed-hat-trimmed.wav");
+            reader.Dispose();
+            Assert.DoesNotThrow(() => reader.Dispose());
+        }
+    }
+}