From 90ba92dbee003443c2674d4b6b7c45a40fea09f5 Mon Sep 17 00:00:00 2001
From: Aravindan NC <35158113+AravindanNC@users.noreply.github.com>
Date: Wed, 5 Aug 2026 10:28:34 -0400
Subject: [PATCH 1/2] Update reportgen.c

---
 source/reportgen/reportgen.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/source/reportgen/reportgen.c b/source/reportgen/reportgen.c
index 4b5c325a..8971c9ab 100644
--- a/source/reportgen/reportgen.c
+++ b/source/reportgen/reportgen.c
@@ -1567,6 +1567,13 @@ T2ERROR encodeEventMarkersInJSON(cJSON *valArray, Vector *eventMarkerList)
         default:
             if(eventMarker->u.markerValue != NULL)
             {
+                if(!eventMarker->reportEmptyParam && checkForEmptyString(eventMarker->u.markerValue))
+                {
+                    T2Debug("Skipping empty/null/zero subscribe marker value for : %s\n", eventMarker->markerName);
+                    free(eventMarker->u.markerValue);
+                    eventMarker->u.markerValue = NULL;
+                    break;
+                }
                 arrayItem = cJSON_CreateObject();
                 if(arrayItem == NULL)
                 {

From 0fc0f39a3eee994578fb3149423d13547e74e9d8 Mon Sep 17 00:00:00 2001
From: Aravindan NC <35158113+AravindanNC@users.noreply.github.com>
Date: Wed, 5 Aug 2026 10:34:57 -0400
Subject: [PATCH 2/2] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 source/reportgen/reportgen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/reportgen/reportgen.c b/source/reportgen/reportgen.c
index 8971c9ab..98834b1f 100644
--- a/source/reportgen/reportgen.c
+++ b/source/reportgen/reportgen.c
@@ -1569,7 +1569,7 @@ T2ERROR encodeEventMarkersInJSON(cJSON *valArray, Vector *eventMarkerList)
             {
                 if(!eventMarker->reportEmptyParam && checkForEmptyString(eventMarker->u.markerValue))
                 {
-                    T2Debug("Skipping empty/null/zero subscribe marker value for : %s\n", eventMarker->markerName);
+                    T2Debug("Skipping empty/\"NULL\" marker value for : %s\n", eventMarker->markerName);
                     free(eventMarker->u.markerValue);
                     eventMarker->u.markerValue = NULL;
                     break;