Resolve potential issue with null address or payload

Dustify · Dustify · commit 834c11356aad · 2024-04-07T22:34:22.000+01:00
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)
                             {

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,13 @@ private void MessageReceived(MessageBase message)`
`221`	`221`
`222`	`222`	`foreach (var filterElement in filterElements)`
`223`	`223`	`{`
`224`		`- if (message.Address.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase) \|\| message.Payload.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase))`
	`224`	`+ if (!string.IsNullOrWhiteSpace(message.Address) && message.Address.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase))`
	`225`	`+ {`
	`226`	`+ filterMatched = true;`
	`227`	`+ break;`
	`228`	`+ }`
	`229`	`+`
	`230`	`+ if (!string.IsNullOrWhiteSpace(message.Payload) && message.Payload.Contains(filterElement, StringComparison.InvariantCultureIgnoreCase))`
`225`	`231`	`{`
`226`	`232`	`filterMatched = true;`
`227`	`233`	`break;`
`@@ -250,7 +256,6 @@ private void MessageReceived(MessageBase message)`
`250`	`256`	`this.dataGridView1.FirstDisplayedScrollingRowIndex = firstDisplayed + 1;`
`251`	`257`	`}`
`252`	`258`	`}`
`253`		`-`
`254`	`259`
`255`	`260`	`if (this.Settings.Logging)`
`256`	`261`	`{`