From b6075d08efe2a6a0470e3be6fdde559d21a22482 Mon Sep 17 00:00:00 2001
From: d-millar <33498836+d-millar@users.noreply.github.com>
Date: Thu, 11 Apr 2024 14:16:52 -0400
Subject: [PATCH] GP-4510: fix for NPEs

---
 Ghidra/Features/Sarif/src/main/java/sarif/SarifPlugin.java   | 2 +-
 .../Sarif/src/main/java/sarif/export/SarifObject.java        | 4 ++--
 .../java/sarif/handlers/result/SarifKindResultHandler.java   | 5 ++++-
 .../java/sarif/handlers/result/SarifLevelResultHandler.java  | 5 ++++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/SarifPlugin.java b/Ghidra/Features/Sarif/src/main/java/sarif/SarifPlugin.java
index 34e1d8ec4d..6dadca0383 100644
--- a/Ghidra/Features/Sarif/src/main/java/sarif/SarifPlugin.java
+++ b/Ghidra/Features/Sarif/src/main/java/sarif/SarifPlugin.java
@@ -59,7 +59,7 @@ import sarif.io.SarifIO;
 	packageName = MiscellaneousPluginPackage.NAME,
 	category = PluginCategoryNames.ANALYSIS,
 	shortDescription = "Sarif Plugin.",
-	description = "From sarif parsing to DL modelling"
+	description = "SARIF parsing and visualization plugin."
 )
 //@formatter:on
 
diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/export/SarifObject.java b/Ghidra/Features/Sarif/src/main/java/sarif/export/SarifObject.java
index 5c947e97f2..343e54fdfb 100644
--- a/Ghidra/Features/Sarif/src/main/java/sarif/export/SarifObject.java
+++ b/Ghidra/Features/Sarif/src/main/java/sarif/export/SarifObject.java
@@ -41,8 +41,8 @@ public class SarifObject implements IsfObject {
 		if (SARIF) {
 			message = new JsonObject();
 			message.addProperty("text", key);
-			kind = "INFORMATIONAL";
-			level = "NONE";
+			kind = "informational";  // convention specifies lower-case
+			level = "none";
 			ruleId = ruleKey;
 			properties = new JsonObject();
 			properties.add("additionalProperties", element);
diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifKindResultHandler.java b/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifKindResultHandler.java
index 9570bcf193..9fdc36f987 100644
--- a/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifKindResultHandler.java
+++ b/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifKindResultHandler.java
@@ -24,7 +24,10 @@ public class SarifKindResultHandler extends SarifResultHandler  {
 	}
 
 	public String parse() {
-		return result.getKind().toString();
+		if (result.getKind() != null) {
+			return result.getKind().toString();
+		}
+		return "none";
 	}
 	
 }
diff --git a/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifLevelResultHandler.java b/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifLevelResultHandler.java
index a88a320e01..4a1637e7fb 100644
--- a/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifLevelResultHandler.java
+++ b/Ghidra/Features/Sarif/src/main/java/sarif/handlers/result/SarifLevelResultHandler.java
@@ -24,7 +24,10 @@ public class SarifLevelResultHandler extends SarifResultHandler  {
 	}
 
 	public String parse() {
-		return result.getLevel().toString();
+		if (result.getLevel() != null) {
+			return result.getLevel().toString();
+		}
+		return "none";
 	}
 	
 }