oem-ibm: Handle the json parse exception correctly

This commit handles the CoD license json parsing exception by correctly catching it and returns the error to the caller. Also made the change to avoid the removal of license json file whenever shared by the host. Tested: Done the sanity testing to verify that json file was kept without removal. Signed-off-by: Jayashankar Padath <[email protected]>
ibm-openbmc · Oct 10, 2024 · dd2c4fb · dd2c4fb
1 parent b4100da
commit dd2c4fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/oem/ibm/libpldmresponder/file_io_type_lic.cpp b/oem/ibm/libpldmresponder/file_io_type_lic.cpp
@@ -33,13 +33,17 @@ int LicenseHandler::updateBinFileAndLicObjs(const fs::path& newLicJsonFilePath)
     int rc = PLDM_SUCCESS;
     fs::path newLicFilePath(fs::path(licFilePath) / newLicenseFile);
     std::ifstream jsonFileNew(newLicJsonFilePath);
+    Json dataNew;
 
-    auto dataNew = Json::parse(jsonFileNew, nullptr, false);
-    if (dataNew.is_discarded())
+    try
+    {
+        dataNew = Json::parse(jsonFileNew);
+    }
+    catch (const Json::parse_error& e)
     {
         error("Failed to parse the new license json file '{NEW_LIC_JSON}'",
               "NEW_LIC_JSON", newLicJsonFilePath);
-        throw InternalFailure();
+        return PLDM_ERROR;
     }
 
     // Store the json data in a file with binary format

diff --git a/oem/ibm/libpldmresponder/utils.cpp b/oem/ibm/libpldmresponder/utils.cpp
@@ -407,12 +407,12 @@ int createOrUpdateLicenseObjs()
 
         if (fs::exists(newLicFilePath))
         {
-            fs::remove_all(newLicFilePath);
+            // fs::remove_all(newLicFilePath);
         }
 
         if (fs::exists(newLicJsonFilePath))
         {
-            fs::remove_all(newLicJsonFilePath);
+            // fs::remove_all(newLicJsonFilePath);
         }
     }