fix(agent): NULL check before accessing segment wraprec (#923)

newrelic · Jun 21, 2024 · 5154931 · 5154931
1 parent 46d9eb5
commit 5154931
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/agent/fw_drupal.c b/agent/fw_drupal.c
@@ -265,7 +265,9 @@ NR_PHP_WRAPPER(nr_drupal_http_request_before) {
      * fcall_end is able to properly dispatch to the after wrapper, as
      * this new segment is now at the top of the segment stack.
      */
-    NRPRG(drupal_http_request_segment)->wraprec = auto_segment->wraprec;
+    if (NULL != NRPRG(drupal_http_request_segment)) {
+      NRPRG(drupal_http_request_segment)->wraprec = auto_segment->wraprec;
+    }
   }
 }
 NR_PHP_WRAPPER_END

diff --git a/agent/lib_predis.c b/agent/lib_predis.c
@@ -764,7 +764,9 @@ NR_PHP_WRAPPER(nr_predis_webdisconnection_executeCommand_before) {
 
   nr_segment_t* segment = NULL;
   segment = nr_segment_start(NRPRG(txn), NULL, NULL);
-  segment->wraprec = auto_segment->wraprec;
+  if (NULL != segment) {
+    segment->wraprec = auto_segment->wraprec;
+  }
 }
 NR_PHP_WRAPPER_END
 
@@ -894,5 +896,4 @@ void nr_predis_enable(TSRMLS_D) {
       NR_PSTR("Predis\\Connection\\WebdisConnection::executeCommand"),
       nr_predis_webdisconnection_executeCommand TSRMLS_CC);
 #endif /* OAPI */
-
 }