Nr 296618 dealloc interaction history list (#319)

* NR-296618: deallocInteractionHistoryList fix * fix up dup dealloc Mehtod * add test interaction history list
newrelic · Dec 3, 2024 · 87338c4 · 87338c4
1 parent e4a99b1
commit 87338c4
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 40 deletions.
diff --git a/Agent/CrashHandler/ExceptionDataInterface/NRMAExceptionMetaDataStore.m b/Agent/CrashHandler/ExceptionDataInterface/NRMAExceptionMetaDataStore.m
@@ -281,17 +281,7 @@ void NRMA__freeMetaData(void)
     }
 
     void NRMA_freeInteractionHistoryList(void) {
-        NRMAInteractionHistoryNode* root = NRMA__getInteractionHistoryList();
-        while (root != NULL) {
-            if (root->name != NULL) {
-                free((void *)root->name);
-                root->name = NULL;
-            }
-
-            NRMAInteractionHistoryNode* temp = root;
-            root = root->next;
-            free((void *)temp);
-        }
+        NRMA__deallocInteractionHistoryList();
     }
 
     void NRMA_freeExceptionData(void) {

diff --git a/Agent/CrashHandler/ExceptionDataInterface/NRMAInteractionHistory.c b/Agent/CrashHandler/ExceptionDataInterface/NRMAInteractionHistory.c
@@ -19,30 +19,34 @@ void NRMA__insertNode(NRMAInteractionHistoryNode* interaction);
 
 void NRMA__AddInteraction(const char* interactionName, long long timestampMillis)
 {
+
+    if (interactionName == NULL || strlen(interactionName) == 0) {
+        return;
+    }
+
     NRMAInteractionHistoryNode* node  = (NRMAInteractionHistoryNode*)malloc(sizeof(NRMAInteractionHistoryNode));
-    if (node != NULL) {
-        size_t len = strlen(interactionName);
-        if (len < 1) {
-            free(node);
-            return;
-        }
-        char* temp = malloc(sizeof(char) * (len+1));
-        if (temp == NULL) {
-            free(node);
-            // Failure case hit here.
-            return;
-        }
-        strncpy(temp, interactionName,len);
-        temp[len] = '\0';
-        node->name = temp;
-        node->timestampMillis = timestampMillis;
-
-        NRMA__insertNode(node);
+
+    if (node == NULL) {
+        return;
     }
+
+    node->name = strdup(interactionName);
+    if (node->name == NULL) {
+        free(node);
+        return;
+    }
+    node->timestampMillis = timestampMillis;
+    node->next = NULL;
+
+    NRMA__insertNode(node);
 }
 
 void NRMA__insertNode(NRMAInteractionHistoryNode* interaction)
 {
+    if (interaction == NULL) {
+        return;
+    }
+
     interaction->next = __list;
     __list = interaction;
 }
@@ -59,14 +63,16 @@ NRMAInteractionHistoryNode* NRMA__getInteractionHistoryList(void)
 
 void NRMA__deallocInteractionHistoryList(void)
 {
-    NRMAInteractionHistoryNode* head = __list;
-    __list = NULL;
-    while (head != NULL) {
-        free((void*)head->name);
-        head->name = NULL;
-        NRMAInteractionHistoryNode* tmp = head->next;
-        free((void*)head);
-        head = NULL;
-        head = tmp;
+    NRMAInteractionHistoryNode* current = __list;
+    NRMAInteractionHistoryNode *next;
+
+    while (current != NULL) {
+        next = current->next;
+
+        free((void*)current->name);
+        free((void*)current);
+        current = next;
     }
+
+    __list = NULL;
 }
diff --git a/Agent/General/NewRelicAgentInternal.m b/Agent/General/NewRelicAgentInternal.m
@@ -757,6 +757,7 @@ - (void) applicationDidEnterBackground {
     @try {
 #endif
         [NRMATraceController completeActivityTrace];
+
         [NRMAInteractionHistoryObjCInterface deallocInteractionHistory];
 #ifndef  DISABLE_NRMA_EXCEPTION_WRAPPER
     } @catch (NSException* exception) {
@@ -1047,8 +1048,20 @@ + (void) shutdown {
         [NRMAUDIDManager deleteStoredID];
 
         // Stored device data, Metadata and crash file are cleared when crash upload.
-        [NRMAInteractionHistoryObjCInterface deallocInteractionHistory];
+#ifndef  DISABLE_NR_EXCEPTION_WRAPPER
+    @try {
+#endif
+        [NRMATraceController completeActivityTrace];
 
+        [NRMAInteractionHistoryObjCInterface deallocInteractionHistory];
+#ifndef  DISABLE_NRMA_EXCEPTION_WRAPPER
+    } @catch (NSException* exception) {
+        [NRMAExceptionHandler logException:exception
+                                     class:NSStringFromClass([self class])
+                                  selector:NSStringFromSelector(_cmd)];
+    }
+#endif
+
         // Clear stored user defaults
         [[[NRMAHarvestController harvestController] harvester] clearStoredConnectionInformation];
         [[[NRMAHarvestController harvestController] harvester] clearStoredHarvesterConfiguration];

diff --git a/Tests/Unit-Tests/NewRelicAgentTests/Uncategorized/NRMAExceptionMetaDataTest.m b/Tests/Unit-Tests/NewRelicAgentTests/Uncategorized/NRMAExceptionMetaDataTest.m
@@ -12,6 +12,7 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/stat.h>
+#import "NRMAInteractionHistory.h"
 
 @interface NRMAExceptionMetaDataTest : XCTestCase
 
@@ -31,6 +32,7 @@ - (void)tearDown
     [super tearDown];
 }
 
+// test 
 - (void)test_NRMA_writeNRMeta
 {
 
@@ -68,7 +70,17 @@ - (void)test_NRMA_writeNRMeta
     NRMA_setDiskFree(123456);
     NRMA_setAccountId(2);
     NRMA_setAgentId(1);
-
+
+
+    // Add interactions.
+
+    long long interactionTime = 1000;
+    NSString* interactionName = @"TestTrace";
+    NRMA__AddInteraction(interactionName.UTF8String, interactionTime);
+    long long interactionTime2 = 2000;
+    NSString* interactionName2 = @"TestTrace2";
+    NRMA__AddInteraction(interactionName2.UTF8String, interactionTime2);
+
     NRMA_writeNRMeta(NULL, NULL, NULL);