Prevent CheckFileContents cause an invalid reason to fail json_value_…

…init_string and cascade into a false passing audit
Azure · Sep 9, 2024 · 19ecb09 · 19ecb09
1 parent de8c82d
commit 19ecb09
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/common/asb/Asb.c b/src/common/asb/Asb.c
@@ -4420,12 +4420,11 @@ int AsbMmiGet(const char* componentName, const char* objectName, char** payload,
 
     if (0 == status)
     {
-        if (NULL == result)
+        if ((NULL == result) || (NULL == (jsonValue = json_value_init_string(result))))
         {
-            OsConfigLogError(log, "AsbMmiGet(%s, %s): audit failure without a reason", componentName, objectName);
-            result = DuplicateString(g_fail);
-
-            if (NULL == result)
+            OsConfigLogError(log, "AsbMmiGet(%s, %s): audit failure without a valid reason", componentName, objectName);
+            FREE_MEMORY(result);
+            if (NULL == (result = DuplicateString(g_fail)))
             {
                 OsConfigLogError(log, "AsbMmiGet: DuplicateString failed");
                 status = ENOMEM;
@@ -4434,7 +4433,7 @@ int AsbMmiGet(const char* componentName, const char* objectName, char** payload,
 
         if (NULL != result)
         {
-            if (NULL == (jsonValue = json_value_init_string(result)))
+            if ((NULL == jsonValue) && (NULL == (jsonValue = json_value_init_string(result))))
             {
                 OsConfigLogError(log, "AsbMmiGet(%s, %s): json_value_init_string(%s) failed", componentName, objectName, result);
                 status = ENOMEM;

diff --git a/src/common/commonutils/FileUtils.c b/src/common/commonutils/FileUtils.c
@@ -1288,8 +1288,8 @@ int CheckFileContents(const char* fileName, const char* text, char** reason, voi
         }
         else
         {
-            OsConfigLogInfo(log, "CheckFileContents: '%s' does not match contents of '%s' ('%s')", text, fileName, contents);
-            OsConfigCaptureReason(reason, "'%s' does not match contents of '%s' ('%s')", text, fileName, contents);
+            OsConfigLogInfo(log, "CheckFileContents: '%s' does not match contents of '%s'", text, fileName);
+            OsConfigCaptureReason(reason, "'%s' does not match contents of '%s'", text, fileName);
             status = ENOENT;
         }
     }