From a5b9cd7ad933db4dbce608eb95fb59976ae9d516 Mon Sep 17 00:00:00 2001
From: iadgovuser58 <124906646+iadgovuser58@users.noreply.github.com>
Date: Fri, 9 Aug 2024 11:47:11 -0400
Subject: [PATCH] checking null object

---
 ...ceSecurityEventDataSubHeaderCertChain.java | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataSubHeaderCertChain.java b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataSubHeaderCertChain.java
index b1cc4011..57680253 100644
--- a/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataSubHeaderCertChain.java
+++ b/HIRS_Utils/src/main/java/hirs/utils/tpm/eventlog/events/DeviceSecurityEventDataSubHeaderCertChain.java
@@ -42,7 +42,7 @@ public class DeviceSecurityEventDataSubHeaderCertChain extends DeviceSecurityEve
     /**
      * Human-readable description of any error associated with SPDM base hash alg.
      */
-    String spdmBaseHashAlgoError = "";
+    String spdmCertChainError = "";
 
     /**
      * DeviceSecurityEventDataSubHeaderCertChain Constructor.
@@ -75,11 +75,16 @@ public class DeviceSecurityEventDataSubHeaderCertChain extends DeviceSecurityEve
 
         int spdmBaseHashAlgoSize = SpdmHa.tcgAlgIdToByteSize(spdmBaseHashAlgo);
 
-        if(spdmBaseHashAlgoSize > 0) {
-            spdmCertChain = new SpdmCertificateChain(spdmCertChainBytes, spdmBaseHashAlgoSize);
+        if(spdmCertChainSize <= 0) {
+            spdmCertChainError += "SPDM cert chain length is not >0, " +
+                    "stopping cert chain processing";
         }
-        else {
-            spdmBaseHashAlgoError += "SPDM base hash algorithm size is not >0";
+        else if(spdmBaseHashAlgoSize <= 0) {
+            spdmCertChainError += "SPDM base hash algorithm size is not >0 " +
+                    "stopping cert chain processing";
+        }
+        if(spdmCertChainError.isEmpty()) {
+            spdmCertChain = new SpdmCertificateChain(spdmCertChainBytes, spdmBaseHashAlgoSize);
         }
     }
 
@@ -96,7 +101,15 @@ public class DeviceSecurityEventDataSubHeaderCertChain extends DeviceSecurityEve
         dsedSubHeaderInfo += "   SPDM Base Hash Algorithm = " + spdmBaseHashAlgoStr + "\n";
 
         // SPDM Certificate Chain output
-        dsedSubHeaderInfo += spdmCertChain.toString();
+        if(!spdmCertChainError.isEmpty()) {
+            dsedSubHeaderInfo += "   SPDM cert chain error: " + spdmCertChainError;
+        }
+        else if(spdmCertChain == null) {
+            dsedSubHeaderInfo += "   SPDM cert chain error: Could not parse cert chain\n";
+        }
+        else {
+            dsedSubHeaderInfo += spdmCertChain.toString();
+        }
 
         return dsedSubHeaderInfo;
     }