Fix DpCatalog to properly close file in off-nominal conditions (#5098)

* Update DpCatalog.cpp

fixed issue #5092 impromper file handing

* Fix missing closes

---------

Co-authored-by: M Starch <LeStarch@googlemail.com>

Author: Saunders-Trinity

Svc/DpCatalog/DpCatalog.cpp

@@ -155,6 +155,7 @@ Fw::CmdResponse DpCatalog::loadStateFile() {
         stat = stateFile.read(buffer, size);
         if (stat != Os::File::OP_OK) {
             this->log_WARNING_HI_StateFileReadError(this->m_stateFile, stat, static_cast<I32>(fileLoc));
+            stateFile.close();
             return Fw::CmdResponse::EXECUTION_ERROR;
         }
 
@@ -169,6 +170,7 @@ Fw::CmdResponse DpCatalog::loadStateFile() {
         if (size != sizeof(buffer)) {
             this->log_WARNING_HI_StateFileTruncated(this->m_stateFile, static_cast<I32>(fileLoc),
                                                     static_cast<I32>(size));
+            stateFile.close();
             return Fw::CmdResponse::OK;
         }
 
@@ -202,7 +204,7 @@ Fw::CmdResponse DpCatalog::loadStateFile() {
         fileLoc += size;
         this->m_stateFileEntries++;
     }
-
+    stateFile.close();
     return Fw::CmdResponse::OK;
 }
 
@@ -265,6 +267,7 @@ void DpCatalog::pruneAndWriteStateFile() {
             stat = stateFile.write(buffer, size);
             if (stat != Os::File::OP_OK) {
                 this->log_WARNING_HI_StateFileWriteError(this->m_stateFile, stat);
+                stateFile.close();
                 return;
             }
         }
@@ -308,6 +311,7 @@ void DpCatalog::appendFileState(const DpStateEntry& entry) {
     FwSizeType size = entryBuffer.getSize();
     stat = stateFile.write(buffer, size);
     if (stat != Os::File::OP_OK) {
+        stateFile.close();
         this->log_WARNING_HI_StateFileWriteError(this->m_stateFile, stat);
         return;
     }