Use CborReaderState.FormatError in Peek() instead of throwing excepti…

…ons.
dotnet · Mar 23, 2020 · 77717cc · bartonjs · Mar 23, 2020 · eiriktsarpalis
1 parent c77f4ad
commit 77717cc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/Cbor.Tests/CborReaderTests.Map.cs b/src/libraries/System.Security.Cryptography.Encoding/tests/Cbor.Tests/CborReaderTests.Map.cs
@@ -255,7 +255,7 @@ public static void ReadMap_IndefiniteLength_OddKeyValuePairs_ShouldThrowFormatEx
                 reader.ReadInt64();
             }
 
-            Assert.Equal(CborReaderState.EndMap, reader.Peek()); // don't want this to fail
+            Assert.Equal(CborReaderState.FormatError, reader.Peek()); // don't want this to fail
             Assert.Throws<FormatException>(() => reader.ReadEndMap());
         }
 

diff --git a/src/libraries/System.Security.Cryptography.Encoding/tests/Cbor/CborReader.cs b/src/libraries/System.Security.Cryptography.Encoding/tests/Cbor/CborReader.cs
@@ -25,6 +25,7 @@ internal enum CborReaderState
         Tag,
         Special,
         Finished,
+        FormatError,
         EndOfData,
     }
 
@@ -57,6 +58,7 @@ public CborReaderState Peek()
                     return _nestedDataItemStack.Peek().type switch
                     {
                         CborMajorType.Array => CborReaderState.EndArray,
+                        CborMajorType.Map when !_isEvenNumberOfDataItemsWritten => CborReaderState.FormatError,
                         CborMajorType.Map => CborReaderState.EndMap,
                         _ => throw new Exception("CborReader internal error. Invalid CBOR major type pushed to stack."),
                     };
@@ -83,13 +85,14 @@ public CborReaderState Peek()
                         CborMajorType.ByteString => CborReaderState.EndByteString,
                         CborMajorType.TextString => CborReaderState.EndTextString,
                         CborMajorType.Array => CborReaderState.EndArray,
+                        CborMajorType.Map when !_isEvenNumberOfDataItemsWritten => CborReaderState.FormatError,
                         CborMajorType.Map => CborReaderState.EndMap,
                         _ => throw new Exception("CborReader internal error. Invalid CBOR major type pushed to stack."),
                     };
                 }
                 else
                 {
-                    throw new FormatException("Unexpected CBOR break byte.");
+                    return CborReaderState.FormatError;
                 }
             }
 
@@ -105,7 +108,7 @@ public CborReaderState Peek()
                 CborMajorType.Map => CborReaderState.StartMap,
                 CborMajorType.Tag => CborReaderState.Tag,
                 CborMajorType.Special => CborReaderState.Special,
-                _ => throw new FormatException("Invalid CBOR major type"),
+                _ => CborReaderState.FormatError,
             };
         }