Fix exception for ogg packets with only one block flag

SamboyCoding · SamboyCoding · commit 564ac6fa9e91 · 2022-07-04T19:09:37.000+01:00
diff --git a/Fmod5Sharp.Tests/Fmod5Sharp.Tests.csproj b/Fmod5Sharp.Tests/Fmod5Sharp.Tests.csproj
@@ -50,6 +50,8 @@
         <EmbeddedResource Include="TestResources\previously_unrecoverable_vorbis.fsb" />
         <None Remove="TestResources\xbox_imaad.fsb" />
         <EmbeddedResource Include="TestResources\xbox_imaad.fsb" />
+        <None Remove="TestResources\vorbis_with_blockflag_exception.fsb" />
+        <EmbeddedResource Include="TestResources\vorbis_with_blockflag_exception.fsb" />
     </ItemGroup>
 
 </Project>
diff --git a/Fmod5Sharp.Tests/Fmod5SharpVorbisTests.cs b/Fmod5Sharp.Tests/Fmod5SharpVorbisTests.cs
@@ -59,5 +59,19 @@ public void PreviouslyUnrecoverableVorbisFilesWorkWithOurCustomRebuilder()
             
             Assert.NotEmpty(oggBytes);
         }
+
+        [Fact]
+        public void VorbisFilesThatPreviouslyThrewExceptionsDoNot()
+        {
+            var rawData = this.LoadResource("vorbis_with_blockflag_exception.fsb");
+
+            var samples = FsbLoader.LoadFsbFromByteArray(rawData).Samples;
+
+            var sample = samples[0];
+            
+            var oggBytes = FmodVorbisRebuilder.RebuildOggFile(sample);
+            
+            Assert.NotEmpty(oggBytes);
+        }
     }
 }
diff --git a/Fmod5Sharp.Tests/TestResources/vorbis_with_blockflag_exception.fsb b/Fmod5Sharp.Tests/TestResources/vorbis_with_blockflag_exception.fsb
diff --git a/Fmod5Sharp/Util/FmodVorbisData.cs b/Fmod5Sharp/Util/FmodVorbisData.cs
@@ -68,7 +68,7 @@ public int GetPacketBlockSize(byte[] packetBytes)
 
         var mode = 0;
 
-        if (BlockFlags.Length > 0)
+        if (BlockFlags.Length > 1)
             mode = bitStream.ReadByte(BlockFlags.Length - 1);
 
         if (BlockFlags[mode] == 1)

Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,19 @@ public void PreviouslyUnrecoverableVorbisFilesWorkWithOurCustomRebuilder()`
`59`	`59`
`60`	`60`	`Assert.NotEmpty(oggBytes);`
`61`	`61`	`}`
	`62`	`+`
	`63`	`+ [Fact]`
	`64`	`+ public void VorbisFilesThatPreviouslyThrewExceptionsDoNot()`
	`65`	`+ {`
	`66`	`+ var rawData = this.LoadResource("vorbis_with_blockflag_exception.fsb");`
	`67`	`+`
	`68`	`+ var samples = FsbLoader.LoadFsbFromByteArray(rawData).Samples;`
	`69`	`+`
	`70`	`+ var sample = samples[0];`
	`71`	`+`
	`72`	`+ var oggBytes = FmodVorbisRebuilder.RebuildOggFile(sample);`
	`73`	`+`
	`74`	`+ Assert.NotEmpty(oggBytes);`
	`75`	`+ }`
`62`	`76`	`}`
`63`	`77`	`}`