Fixes for NULL_RETURNS Coverity Issues - Part 2

2 files changed, 9 insertions, 0 deletions

diff --git a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
index 304f5aa94..c0bb627c2 100644
--- a/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
+++ b/base/common/src/com/netscape/cmscore/dbs/DBSubsystem.java
@@ -408,6 +408,9 @@ public class DBSubsystem implements IDBSubsystem {
 
             LDAPEntry entry = conn.read(dn);
             LDAPAttribute attr = entry.getAttribute(PROP_NEXT_RANGE);
+            if (attr == null) {
+                throw new Exception("Missing Attribute" + PROP_NEXT_RANGE + "in Entry " + dn);
+            }
             nextRange = (String) attr.getStringValues().nextElement();
 
             BigInteger nextRangeNo = new BigInteger(nextRange);
diff --git a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
index 726746627..0fbff688a 100644
--- a/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
+++ b/base/common/src/com/netscape/cmscore/dbs/KeyRepository.java
@@ -251,6 +251,9 @@ public class KeyRepository extends Repository implements IKeyRepository {
      */
     public IKeyRecord readKeyRecord(BigInteger serialNo)
             throws EBaseException {
+        if (serialNo == null) {
+            throw new EBaseException("Invalid Serial Number.");
+        }
         IDBSSession s = mDBService.createSession();
         KeyRecord rec = null;
 
@@ -264,6 +267,9 @@ public class KeyRepository extends Repository implements IKeyRepository {
             if (s != null)
                 s.close();
         }
+        if (rec == null) {
+            throw new EBaseException("Failed to recover Key for Serial Number " + serialNo);
+        }
         return rec;
     }