Fix potential stack overflow in Record app

jo3bingham · jo3bingham · commit ffb5766473c0 · 2019-10-21T14:56:34.000+01:00
diff --git a/Apps/Record/Program.cs b/Apps/Record/Program.cs
@@ -1,5 +1,5 @@
 ﻿using System;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
@@ -21,9 +21,7 @@ class Message
 
     class Program
     {
-        static readonly Queue<Message> _fileWriteQueue = new Queue<Message>();
-
-        static readonly object _queueLock = new object();
+        static readonly ConcurrentQueue<Message> _fileWriteQueue = new ConcurrentQueue<Message>();
 
         static readonly Stopwatch _stopWatch = new Stopwatch();
 
@@ -195,10 +193,7 @@ private static void QueueMessage(PacketType packetType, byte[] data)
                 Type = packetType
             };
 
-            lock (_queueLock)
-            {
-                _fileWriteQueue.Enqueue(packetData);
-            }
+            _fileWriteQueue.Enqueue(packetData);
 
             if (!_isWritingToFile)
             {
@@ -219,33 +214,22 @@ private static void WriteData()
         {
             try
             {
-                Message packet = null;
-
-                lock (_queueLock)
-                {
-                    if (_fileWriteQueue.Count > 0)
-                    {
-                        packet = _fileWriteQueue.Dequeue();
-                    }
-                }
-
-                if (packet == null)
+                while (_fileWriteQueue.TryDequeue(out var packet))
                 {
-                    _isWritingToFile = false;
-                    return;
+                    _binaryWriter.Write((byte)packet.Type);
+                    _binaryWriter.Write(packet.Timestamp);
+                    _binaryWriter.Write(packet.Data.Length);
+                    _binaryWriter.Write(packet.Data);
                 }
-
-                _binaryWriter.Write((byte)packet.Type);
-                _binaryWriter.Write(packet.Timestamp);
-                _binaryWriter.Write(packet.Data.Length);
-                _binaryWriter.Write(packet.Data);
-
-                WriteData();
             }
             catch (Exception ex)
             {
                 Console.WriteLine(ex);
             }
+            finally
+            {
+                _isWritingToFile = false;
+            }
         }
     }
 }
