Resolve potential issue with null address or payload

Dustify · Apr 7, 2024 · 834c113 · 834c113
1 parent 498425a
commit 834c113
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/SdrsDecoder.Plugin/PocsagControl.cs b/SdrsDecoder.Plugin/PocsagControl.cs
@@ -221,7 +221,13 @@ private void MessageReceived(MessageBase message)
 
                                 foreach (var filterElement in filterElements)
                                 {
-                                    if (message.Address.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase) || message.Payload.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase))
+                                    if (!string.IsNullOrWhiteSpace(message.Address) && message.Address.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase))
+                                    {
+                                        filterMatched = true;
+                                        break;
+                                    }
+
+                                    if (!string.IsNullOrWhiteSpace(message.Payload) && message.Payload.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase))
                                     {
                                         filterMatched = true;
                                         break;
@@ -250,7 +256,6 @@ private void MessageReceived(MessageBase message)
                                     this.dataGridView1.FirstDisplayedScrollingRowIndex = firstDisplayed + 1;
                                 }
                             }
-
                             
                             if (this.Settings.Logging)
                             {