From 45fb54e8ac6a90f4eb1f2ed4d645ac093a012a84 Mon Sep 17 00:00:00 2001
From: Buyaa Namnan <bunamnan@microsoft.com>
Date: Thu, 5 Sep 2024 14:51:41 -0700
Subject: [PATCH] Reference System.Formats.Nrbf project directly, remove catch
 blocks that not needed anymore with the fix

---
 .../DotnetFuzzing/DotnetFuzzing.csproj        |  5 +++-
 .../Fuzzers/NrbfDecoderFuzzer.cs              | 26 ++++++++++++-------
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/libraries/Fuzzing/DotnetFuzzing/DotnetFuzzing.csproj b/src/libraries/Fuzzing/DotnetFuzzing/DotnetFuzzing.csproj
index 86c7c058a8fff..82f54f412ace6 100644
--- a/src/libraries/Fuzzing/DotnetFuzzing/DotnetFuzzing.csproj
+++ b/src/libraries/Fuzzing/DotnetFuzzing/DotnetFuzzing.csproj
@@ -13,7 +13,6 @@
 
   <ItemGroup>
     <PackageReference Include="SharpFuzz" Version="2.1.1" />
-    <PackageReference Include="System.Formats.Nrbf" Version="9.0.0-preview.7.24405.7" />
   </ItemGroup>
 
   <ItemGroup>
@@ -31,4 +30,8 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\System.Formats.Nrbf\src\System.Formats.Nrbf.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/libraries/Fuzzing/DotnetFuzzing/Fuzzers/NrbfDecoderFuzzer.cs b/src/libraries/Fuzzing/DotnetFuzzing/Fuzzers/NrbfDecoderFuzzer.cs
index 15d7d147bc239..46da18e4b0fc8 100644
--- a/src/libraries/Fuzzing/DotnetFuzzing/Fuzzers/NrbfDecoderFuzzer.cs
+++ b/src/libraries/Fuzzing/DotnetFuzzing/Fuzzers/NrbfDecoderFuzzer.cs
@@ -18,10 +18,18 @@ internal sealed class NrbfDecoderFuzzer : IFuzzer
 
         public void FuzzTarget(ReadOnlySpan<byte> bytes)
         {
-            using PooledBoundedMemory<byte> inputPoisoned = PooledBoundedMemory<byte>.Rent(bytes, PoisonPagePlacement.After);
-            using MemoryStream stream = new MemoryStream(inputPoisoned.Memory.ToArray());
+            using PooledBoundedMemory<byte> inputPoisonedAfter = PooledBoundedMemory<byte>.Rent(bytes, PoisonPagePlacement.After);
+            using PooledBoundedMemory<byte> inputPoisonedBefore = PooledBoundedMemory<byte>.Rent(bytes, PoisonPagePlacement.Before);
+            using MemoryStream streamAfter = new MemoryStream(inputPoisonedAfter.Memory.ToArray());
+            using MemoryStream streamBefore = new MemoryStream(inputPoisonedBefore.Memory.ToArray());
 
-            if (NrbfDecoder.StartsWithPayloadHeader(inputPoisoned.Span))
+            Test(inputPoisonedAfter.Span, streamAfter);
+            Test(inputPoisonedBefore.Span, streamBefore);
+        }
+
+        private static void Test(Span<byte> testSpan, MemoryStream stream)
+        {
+            if (NrbfDecoder.StartsWithPayloadHeader(testSpan))
             {
                 try
                 {
@@ -52,7 +60,6 @@ public void FuzzTarget(ReadOnlySpan<byte> bytes)
                         case SerializationRecordType.ClassWithId:
                         case SerializationRecordType.ClassWithMembersAndTypes:
                         case SerializationRecordType.SystemClassWithMembersAndTypes:
-                        {
                             ClassRecord classRecord = (ClassRecord)record;
                             Assert.NotNull(classRecord.TypeName);
 
@@ -60,7 +67,7 @@ public void FuzzTarget(ReadOnlySpan<byte> bytes)
                             {
                                 Assert.Equal(true, classRecord.HasMember(name));
                             }
-                        } break;
+                            break;
                         case SerializationRecordType.MemberPrimitiveTyped:
                             PrimitiveTypeRecord primitiveType = (PrimitiveTypeRecord)record;
                             Assert.NotNull(primitiveType.Value);
@@ -69,6 +76,8 @@ public void FuzzTarget(ReadOnlySpan<byte> bytes)
                             Assert.NotNull(record.TypeName);
                             break;
                         case SerializationRecordType.BinaryLibrary:
+                            Assert.Equal(false, record.Id.Equals(default));
+                            break;
                         case SerializationRecordType.ObjectNull:
                         case SerializationRecordType.ObjectNullMultiple:
                         case SerializationRecordType.ObjectNullMultiple256:
@@ -86,8 +95,9 @@ public void FuzzTarget(ReadOnlySpan<byte> bytes)
                 catch (NotSupportedException) { /* Reading from the stream encountered unsupported records */ }
                 catch (DecoderFallbackException) { /* Reading from the stream encountered an invalid UTF8 sequence. */ }
                 catch (EndOfStreamException) { /* The end of the stream was reached before reading SerializationRecordType.MessageEnd record. */ }
+                catch (IOException) { /* An I/O error occurred. */ }
             }
-            else 
+            else
             {
                 try
                 {
@@ -97,10 +107,6 @@ public void FuzzTarget(ReadOnlySpan<byte> bytes)
                 catch (SerializationException) { /* Everything has to start with a header */ }
                 catch (NotSupportedException) { /* Reading from the stream encountered unsupported records */ }
                 catch (EndOfStreamException) { /* The end of the stream was reached before reading SerializationRecordType.MessageEnd record. */ }
-                catch (DecoderFallbackException) { /* Reading from the stream encountered an invalid UTF8 sequence. */ }
-                // below exceptions are not expected
-                catch (FormatException) { /* Temporarily catch this until its fixed */ }
-                catch (IOException) { /* Temporarily catch this until its fixed */ }
             }
         }
     }