Fixes for Forward Null Cases in Coverity for DogTag10

Addressed review coments.

2 files changed, 10 insertions, 3 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index f1bc93f68..159759517 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -519,6 +519,9 @@ public class CMCRequest {
             hmacDigest.update(b);
             finalDigest = hmacDigest.digest();
         } catch (NoSuchAlgorithmException ex) {
+            System.out.println("CMCRequest::addIdentityProofAttr() - "
+                    + "No such algorithm!");
+            return -1;
         }
 
         TaggedAttribute identityProof = new TaggedAttribute(new
diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index 9fbab5da6..4403dc8ec 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -4223,9 +4223,13 @@ public class DRMTool {
                         // if one is not already present,
                         // compose and write out the missing
                         // 'extdata_requestnotes' line
-                        create_extdata_request_notes(record_type,
-                                                      previous_line,
-                                                      writer);
+                        if (previous_line != null) {
+                            create_extdata_request_notes(record_type,
+                                    previous_line,
+                                    writer);
+                        } else {
+                            return FAILURE;
+                        }
 
                         // ALWAYS pass through the original
                         // 'extdata-requesttype' line UNCHANGED