Avoiding potential ArgumentOutOfRangeException in Sample/WaveAggregat…

…orBase class.
BirdAPI · Jul 23, 2016 · 2a39388 · 2a39388
1 parent be67770
commit 2a39388
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CSCore/SampleAggregatorBase.cs b/CSCore/SampleAggregatorBase.cs
@@ -41,9 +41,9 @@ public SampleAggregatorBase(ISampleSource source)
         public virtual int Read(float[] buffer, int offset, int count)
         {
             if (offset % WaveFormat.Channels != 0)
-                throw new ArgumentOutOfRangeException("offset");
+                offset -= offset % WaveFormat.Channels;
             if (count % WaveFormat.Channels != 0)
-                throw new ArgumentOutOfRangeException("count");
+                count -= count % WaveFormat.Channels;
 
             return BaseSource.Read(buffer, offset, count);
         }

diff --git a/CSCore/WaveAggregatorBase.cs b/CSCore/WaveAggregatorBase.cs
@@ -5,7 +5,7 @@ namespace CSCore
     /// <summary>
     ///     Base class for all wave aggregators.
     /// </summary>
-    public abstract class WaveAggregatorBase : IWaveSource, IAggregator<byte, IWaveSource>
+    public abstract class WaveAggregatorBase : IWaveAggregator
     {
         private IWaveSource _baseSource;
         private bool _disposed;
@@ -77,6 +77,11 @@ public virtual WaveFormat WaveFormat
         /// <returns>The total number of bytes read into the buffer.</returns>
         public virtual int Read(byte[] buffer, int offset, int count)
         {
+            if (offset % WaveFormat.Channels != 0)
+                offset -= offset % WaveFormat.Channels;
+            if (count % WaveFormat.Channels != 0)
+                count -= count % WaveFormat.Channels;
+
             return BaseSource.Read(buffer, offset, count);
         }