[edk2-devel] [PATCH 1/4][edk2-redfish-client] RedfishClientPkg: fix memory leak

["Mike Maslenkin" <mike.maslenkin@gmail.com>]

This patch fixes leak of EFI_REDFISH_COMPUTERSYSTEMCOLLECTION instance
on error path.

Cc: Abner Chang <abner.chang@amd.com>
Cc: Igor Kulchytskyy <igork@ami.com>
Cc: Nickle Wang <nicklew@nvidia.com>
Signed-off-by: Mike Maslenkin <mike.maslenkin@gmail.com>
---
 .../ComputerSystemCollectionDxe.c                    | 12 +++++++++---
 .../MemoryCollectionDxe/MemoryCollectionDxe.c        | 11 ++++++++---
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c b/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
index 55a6d07dbf2e..3deefa824629 100644
--- a/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
+++ b/RedfishClientPkg/Features/ComputerSystemCollectionDxe/ComputerSystemCollectionDxe.c
@@ -174,11 +174,13 @@ HandleCollectionResource (
   CollectionCs = Collection->ComputerSystemCollection;
 
   if (*CollectionCs->Membersodata_count == 0) {
-    return EFI_NOT_FOUND;
+    Status = EFI_NOT_FOUND;
+    goto ON_RELEASE;
   }
 
   if (IsLinkEmpty (&CollectionCs->Members)) {
-    return EFI_NOT_FOUND;
+    Status = EFI_NOT_FOUND;
+    goto ON_RELEASE;
   }
 
   List = GetFirstLink (&CollectionCs->Members);
@@ -206,12 +208,16 @@ HandleCollectionResource (
     List = GetNextLink (&CollectionCs->Members, List);
   }
 
+  Status = EFI_SUCCESS;
+
+ON_RELEASE:
+
   //
   // Release resource.
   //
   Private->JsonStructProtocol->DestoryStructure (Private->JsonStructProtocol, (EFI_REST_JSON_STRUCTURE_HEADER *)Collection);
 
-  return EFI_SUCCESS;
+  return Status;
 }
 
 EFI_STATUS
diff --git a/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c b/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
index d963fb52ad37..38f28f902715 100644
--- a/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
+++ b/RedfishClientPkg/Features/MemoryCollectionDxe/MemoryCollectionDxe.c
@@ -165,11 +165,13 @@ HandleCollectionResource (
   CollectionCs = Collection->MemoryCollection;
 
   if (*CollectionCs->Membersodata_count == 0) {
-    return EFI_NOT_FOUND;
+    Status = EFI_NOT_FOUND;
+    goto ON_RELEASE;
   }
 
   if (IsLinkEmpty (&CollectionCs->Members)) {
-    return EFI_NOT_FOUND;
+    Status = EFI_NOT_FOUND;
+    goto ON_RELEASE;
   }
 
   List = GetFirstLink (&CollectionCs->Members);
@@ -197,12 +199,15 @@ HandleCollectionResource (
     List = GetNextLink (&CollectionCs->Members, List);
   }
 
+  Status = EFI_SUCCESS;
+
+ON_RELEASE:
   //
   // Release resource.
   //
   Private->JsonStructProtocol->DestoryStructure (Private->JsonStructProtocol, (EFI_REST_JSON_STRUCTURE_HEADER *)Collection);
 
-  return EFI_SUCCESS;
+  return Status;
 }
 
 EFI_STATUS
-- 
2.32.0 (Apple Git-132)



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#116565): https://edk2.groups.io/g/devel/message/116565
Mute This Topic: https://groups.io/mt/104841892/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-