problem: get string might throw

Author: somdoron

src/NetMQ/ReceiveThreadSafeSocketExtensions.cs

@@ -32,7 +32,7 @@ public static byte[] ReceiveBytes([NotNull] this IThreadSafeInSocket socket)
             msg.Close();
             return data;
         }
-        
+
         #endregion
 
         #region Immediate
@@ -61,7 +61,8 @@ public static bool TryReceiveBytes([NotNull] this IThreadSafeInSocket socket, ou
         /// <param name="timeout">The maximum period of time to wait for a message to become available.</param>
         /// <param name="bytes">The content of the received message, or <c>null</c> if no message was available.</param>
         /// <returns><c>true</c> if a message was available, otherwise <c>false</c>.</returns>
-        public static bool TryReceiveBytes([NotNull] this IThreadSafeInSocket socket, TimeSpan timeout, out byte[] bytes)
+        public static bool TryReceiveBytes([NotNull] this IThreadSafeInSocket socket, TimeSpan timeout,
+            out byte[] bytes)
         {
             var msg = new Msg();
             msg.InitEmpty();
@@ -80,9 +81,9 @@ public static bool TryReceiveBytes([NotNull] this IThreadSafeInSocket socket, Ti
         }
 
         #endregion
-        
+
         #region Async
-        
+
         /// <summary>
         /// Receive a bytes from <paramref name="socket"/> asynchronously.
         /// </summary>
@@ -92,16 +93,16 @@ public static ValueTask<byte[]> ReceiveBytesAsync([NotNull] this IThreadSafeInSo
         {
             if (TryReceiveBytes(socket, out var bytes))
                 return new ValueTask<byte[]>(bytes);
-            
+
             // TODO: this is a hack, eventually we need kind of IO ThreadPool for thread-safe socket to wait on asynchronously
             // and probably implement IValueTaskSource
             return new ValueTask<byte[]>(Task.Factory.StartNew(socket.ReceiveBytes, TaskCreationOptions.LongRunning));
         }
-        
+
         #endregion
-        
+
         #endregion
-        
+
         #region Receiving string
 
         #region Blocking
@@ -128,15 +129,19 @@ public static string ReceiveString([NotNull] this IThreadSafeInSocket socket, [N
             msg.InitEmpty();
 
             socket.Receive(ref msg);
-            
-            var str = msg.Size > 0
-                ? msg.GetString(encoding)
-                : string.Empty;
 
-            msg.Close();
-            return str;
+            try
+            {
+                return msg.Size > 0
+                    ? msg.GetString(encoding)
+                    : string.Empty;
+            }
+            finally
+            {
+                msg.Close();
+            }
         }
-        
+
         #endregion
 
         #region Immediate
@@ -161,7 +166,8 @@ public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, o
         /// <param name="encoding">The encoding used to convert the data to a string.</param>
         /// <param name="str">The content of the received message, or <c>null</c> if no message was available.</param>
         /// <returns><c>true</c> if a message was available, otherwise <c>false</c>.</returns>
-        public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, [NotNull] Encoding encoding, out string str)
+        public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, [NotNull] Encoding encoding,
+            out string str)
         {
             return socket.TryReceiveString(TimeSpan.Zero, encoding, out str);
         }
@@ -192,19 +198,25 @@ public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, T
         /// <param name="encoding">The encoding used to convert the data to a string.</param>
         /// <param name="str">The content of the received message, or <c>null</c> if no message was available.</param>
         /// <returns><c>true</c> if a message was available, otherwise <c>false</c>.</returns>
-        public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, TimeSpan timeout, [NotNull] Encoding encoding, out string str)
+        public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, TimeSpan timeout,
+            [NotNull] Encoding encoding, out string str)
         {
             var msg = new Msg();
             msg.InitEmpty();
 
             if (socket.TryReceive(ref msg, timeout))
             {
-                str = msg.Size > 0
-                    ? msg.GetString(encoding)
-                    : string.Empty;
-
-                msg.Close();
-                return true;
+                try
+                {
+                    str = msg.Size > 0
+                        ? msg.GetString(encoding)
+                        : string.Empty;
+                    return true;
+                }
+                finally
+                {
+                    msg.Close();    
+                }
             }
 
             str = null;
@@ -213,9 +225,9 @@ public static bool TryReceiveString([NotNull] this IThreadSafeInSocket socket, T
         }
 
         #endregion
-        
+
         #region Async
-        
+
         /// <summary>
         /// Receive a string from <paramref name="socket"/> asynchronously.
         /// </summary>
@@ -225,7 +237,7 @@ public static ValueTask<string> ReceiveStringAsync([NotNull] this IThreadSafeInS
         {
             if (TryReceiveString(socket, out var msg))
                 return new ValueTask<string>(msg);
-                    
+
             // TODO: this is a hack, eventually we need kind of IO ThreadPool for thread-safe socket to wait on asynchronously
             // and probably implement IValueTaskSource
             return new ValueTask<string>(Task.Factory.StartNew(socket.ReceiveString, TaskCreationOptions.LongRunning));

src/NetMQ/ReceivingSocketExtensions.cs

@@ -315,12 +315,16 @@ public static string ReceiveFrameString([NotNull] this IReceivingSocket socket,
 
             more = msg.HasMore;
 
-            var str = msg.Size > 0
-                ? msg.GetString(encoding)
-                : string.Empty;
-
-            msg.Close();
-            return str;
+            try
+            {
+                return msg.Size > 0
+                    ? msg.GetString(encoding)
+                    : string.Empty;
+            }
+            finally
+            {
+                msg.Close();    
+            }
         }
 
         #endregion
@@ -443,12 +447,17 @@ public static bool TryReceiveFrameString([NotNull] this IReceivingSocket socket,
             {
                 more = msg.HasMore;
 
-                frameString = msg.Size > 0
-                    ? msg.GetString(encoding)
-                    : string.Empty;
-
-                msg.Close();
-                return true;
+                try
+                {
+                    frameString = msg.Size > 0
+                        ? msg.GetString(encoding)
+                        : string.Empty;
+                    return true;
+                }
+                finally
+                {
+                    msg.Close();    
+                }
             }
 
             frameString = null;

src/NetMQ/RoutingIdSocketExtensions.cs

@@ -386,12 +386,17 @@ public static (uint, string) ReceiveString([NotNull] this IRoutingIdSocket socke
 
             var routingId = msg.RoutingId;
 
-            var str = msg.Size > 0
-                ? msg.GetString(encoding)
-                : string.Empty;
-
-            msg.Close();
-            return (routingId, str);
+            try
+            {
+                var str = msg.Size > 0
+                    ? msg.GetString(encoding)
+                    : string.Empty;
+                return (routingId, str);
+            }
+            finally
+            {
+                msg.Close();    
+            }
         }
 
         #endregion
@@ -462,12 +467,17 @@ public static bool TryReceiveString([NotNull] this IRoutingIdSocket socket, Time
             {
                 routingId = msg.RoutingId;
 
-                str = msg.Size > 0
-                    ? msg.GetString(encoding)
-                    : string.Empty;
-
-                msg.Close();
-                return true;
+                try
+                {
+                    str = msg.Size > 0
+                        ? msg.GetString(encoding)
+                        : string.Empty;
+                    return true;
+                }
+                finally
+                {
+                    msg.Close();    
+                }
             }
 
             str = null;