about summary refs log tree commit diff
path: root/IrcTokens
diff options
context:
space:
mode:
Diffstat (limited to 'IrcTokens')
-rw-r--r--IrcTokens/StatefulDecoder.cs2
-rw-r--r--IrcTokens/Tests/StatefulDecoder.cs4
2 files changed, 3 insertions, 3 deletions
diff --git a/IrcTokens/StatefulDecoder.cs b/IrcTokens/StatefulDecoder.cs
index b2bad5e..1f6636b 100644
--- a/IrcTokens/StatefulDecoder.cs
+++ b/IrcTokens/StatefulDecoder.cs
@@ -60,7 +60,7 @@ namespace IrcTokens
             _buffer = _buffer == null ? Array.Empty<byte>() : _buffer.Concat(data.Take(bytesReceived)).ToArray();
 
             var listLines = _buffer.Split((byte) '\n').Select(l => l.Trim((byte) '\r')).ToList();
-            _buffer = listLines.Last();
+            _buffer = listLines.LastOrDefault() ?? Array.Empty<byte>();
 
             var decodeLines = new List<Line>();
             foreach (var line in listLines.SkipLast(1).Select(l => l.ToArray()))
diff --git a/IrcTokens/Tests/StatefulDecoder.cs b/IrcTokens/Tests/StatefulDecoder.cs
index c5728a5..9d2b8b7 100644
--- a/IrcTokens/Tests/StatefulDecoder.cs
+++ b/IrcTokens/Tests/StatefulDecoder.cs
@@ -66,7 +66,7 @@ namespace IrcTokens.Tests
         public void TestEmpty()
         {
             var lines = _decoder.Push(string.Empty);
-            Assert.IsNull(lines);
+            Assert.AreEqual(0, lines.Count);
         }
 
         [TestMethod]
@@ -74,7 +74,7 @@ namespace IrcTokens.Tests
         {
             _decoder.Push("PRIVMSG #channel hello");
             var lines = _decoder.Push(string.Empty);
-            Assert.IsNull(lines);
+            Assert.AreEqual(0, lines.Count);
         }
 
         [TestMethod]