Fix memleak ADUC_ParseUpdateType (#351)

* fix memleak ADUC_ParseUpdateType * clang-format
Azure · Jan 19, 2023 · 2c264e4 · 2c264e4
1 parent 53647c3
commit 2c264e4
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/extensions/step_handlers/swupdate_handler/src/swupdate_handler.cpp b/src/extensions/step_handlers/swupdate_handler/src/swupdate_handler.cpp
@@ -183,6 +183,7 @@ ADUC_Result SWUpdateHandlerImpl::Download(const tagADUC_WorkflowData* workflowDa
 done:
     workflow_free_string(workFolder);
     workflow_free_file_entity(entity);
+    free(updateName);
 
     return result;
 }
@@ -326,10 +327,7 @@ ADUC_Result SWUpdateHandlerImpl::Apply(const tagADUC_WorkflowData* workflowData)
         CancelApply(ADUC_LOG_FOLDER);
     }
 
-    result = {
-        .ResultCode = ADUC_Result_Success,
-        .ExtendedResultCode = 0
-    };
+    result = { .ResultCode = ADUC_Result_Success, .ExtendedResultCode = 0 };
 
 done:
     workflow_free_string(workFolder);

diff --git a/src/utils/c_utils/tests/c_utils_ut.cpp b/src/utils/c_utils/tests/c_utils_ut.cpp
@@ -223,6 +223,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Missing Update Name")
@@ -231,6 +232,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Missing Version Number")
@@ -239,6 +241,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Missing Delimiter")
@@ -247,6 +250,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Negative Number")
@@ -255,6 +259,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Ransome Negative Number")
@@ -263,6 +268,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Zero")
@@ -273,6 +279,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         CHECK(ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
         CHECK_THAT(updateTypeName, Equals("microsoft/apt"));
         CHECK(updateTypeVersion == 0);
+        free(updateTypeName);
     }
 
     SECTION("Positive Number")
@@ -283,6 +290,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         CHECK(ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
         CHECK_THAT(updateTypeName, Equals("microsoft/apt"));
         CHECK(updateTypeVersion == 1);
+        free(updateTypeName);
     }
 
     SECTION("Positive Large Number")
@@ -293,6 +301,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         CHECK(ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
         CHECK_THAT(updateTypeName, Equals("microsoft/apt"));
         CHECK(updateTypeVersion == 4294967294);
+        free(updateTypeName);
     }
 
     SECTION("Positive UINT MAX")
@@ -301,6 +310,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Positive Larger Than UINT MAX")
@@ -309,6 +319,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Positive ULONG MAX")
@@ -317,6 +328,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Version contains space")
@@ -325,6 +337,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 
     SECTION("Decimal version")
@@ -333,6 +346,7 @@ TEST_CASE("ADUC_ParseUpdateType and atoui")
         char* updateTypeName = nullptr;
         unsigned int updateTypeVersion;
         CHECK(!ADUC_ParseUpdateType(updateType, &updateTypeName, &updateTypeVersion));
+        free(updateTypeName);
     }
 }