From fb17547e693f711cc36aac3d59bfd1dfcf075e9b Mon Sep 17 00:00:00 2001
From: Winni Neessen <winfried.neessen@cleverbridge.com>
Date: Wed, 29 Nov 2023 17:40:31 +0100
Subject: [PATCH] Improve error handling in msg.go

Added additional checks when calling values from the genHeader map in msg.go file. This is to prevent trying to operate on non-existing keys, hence avoiding possible null pointer exceptions. The checks ensure the key HeaderMessageID exists in the genHeader map before attempting to operate on it. This is essential for functions like RequestMDNTo, RequestMDNToFormat, and RequestMDNAddToFormat, thereby improving the robustness of the code.
---
 msg_test.go | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/msg_test.go b/msg_test.go
index c90f8de..40ecc77 100644
--- a/msg_test.go
+++ b/msg_test.go
@@ -1168,9 +1168,11 @@ func TestMsg_RequestMDN(t *testing.T) {
 	if err := m.RequestMDNAddTo(v2); err != nil {
 		t.Errorf("RequestMDNAddTo with a valid address failed: %s", err)
 	}
-	if m.genHeader[HeaderDispositionNotificationTo][1] != fmt.Sprintf("<%s>", v2) {
-		t.Errorf("RequestMDNTo with a multiple valid addresses failed. Expected 1: %s, got 1: %s", v2,
-			m.genHeader[HeaderDispositionNotificationTo][1])
+	if val := m.genHeader[HeaderDispositionNotificationTo]; val != nil && len(val) > 1 {
+		if val[1] != fmt.Sprintf("<%s>", v2) {
+			t.Errorf("RequestMDNTo with a multiple valid addresses failed. Expected 1: %s, got 1: %s", v2,
+				val[1])
+		}
 	}
 	m.Reset()
 
@@ -1178,16 +1180,20 @@ func TestMsg_RequestMDN(t *testing.T) {
 	if err := m.RequestMDNToFormat(n, v); err != nil {
 		t.Errorf("RequestMDNToFormat with a single valid address failed: %s", err)
 	}
-	if m.genHeader[HeaderDispositionNotificationTo][0] != fmt.Sprintf(`"%s" <%s>`, n, v) {
-		t.Errorf(`RequestMDNToFormat with a single valid address failed. Expected: "%s" <%s>, got: %s`, n, v,
-			m.genHeader[HeaderDispositionNotificationTo][0])
+	if val := m.genHeader[HeaderDispositionNotificationTo]; val != nil && len(val) > 0 {
+		if val[0] != fmt.Sprintf(`"%s" <%s>`, n, v) {
+			t.Errorf(`RequestMDNToFormat with a single valid address failed. Expected: "%s" <%s>, got: %s`, n, v,
+				val[0])
+		}
 	}
 	if err := m.RequestMDNAddToFormat(n2, v2); err != nil {
 		t.Errorf("RequestMDNAddToFormat with a valid address failed: %s", err)
 	}
-	if m.genHeader[HeaderDispositionNotificationTo][1] != fmt.Sprintf(`"%s" <%s>`, n2, v2) {
-		t.Errorf(`RequestMDNAddToFormat with a single valid address failed. Expected: "%s" <%s>, got: %s`, n2, v2,
-			m.genHeader[HeaderDispositionNotificationTo][1])
+	if val := m.genHeader[HeaderDispositionNotificationTo]; val != nil && len(val) > 1 {
+		if val[1] != fmt.Sprintf(`"%s" <%s>`, n2, v2) {
+			t.Errorf(`RequestMDNAddToFormat with a single valid address failed. Expected: "%s" <%s>, got: %s`, n2, v2,
+				val[1])
+		}
 	}
 	m.Reset()