Merge pull request zeromq#532 from igvk/monitorevent_null

Check m_addr for null in MonitorEvent.Write
okusnadi · Apr 22, 2016 · b1dddc3 · b1dddc3
2 parents ed1d643 + 42e72e7
commit b1dddc3
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/NetMQ/Core/MonitorEvent.cs b/src/NetMQ/Core/MonitorEvent.cs
@@ -65,7 +65,7 @@ private MonitorEvent(SocketEvents monitorEvent, [NotNull] string addr, [NotNull]
 
         public void Write([NotNull] SocketBase s)
         {
-            int size = 4 + 1 + m_addr.Length + 1; // event + len(addr) + addr + flag
+            int size = 4 + 1 + (m_addr?.Length ?? 0) + 1; // event + len(addr) + addr + flag
 
             if (m_flag == ValueInteger)
                 size += 4;
@@ -77,12 +77,16 @@ public void Write([NotNull] SocketBase s)
             ByteArraySegment buffer = new byte[size];
             buffer.PutInteger(Endianness.Little, (int)m_monitorEvent, pos);
             pos += 4;
-            buffer[pos++] = (byte)m_addr.Length;
 
-            // was not here originally
+            if (m_addr != null)
+            {
+                buffer[pos++] = (byte)m_addr.Length;
+
+                // was not here originally
 
-            buffer.PutString(m_addr, pos);
-            pos += m_addr.Length;
+                buffer.PutString(m_addr, pos);
+                pos += m_addr.Length;
+            }
 
             buffer[pos++] = ((byte)m_flag);
             if (m_flag == ValueInteger)