Tools: Deallocate memory allocated by AcGetAllTablesFromFile via AcDe…

…leteTableList Signed-off-by: Erik Schmauss <erik.schmauss@intel.com>
acpica · Jun 9, 2017 · 8521b98 · 8521b98
1 parent 5b16148
commit 8521b98
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 0 deletions.
diff --git a/source/common/acfileio.c b/source/common/acfileio.c
@@ -173,6 +173,36 @@ AcCheckTextModeCorruption (
     ACPI_TABLE_HEADER       *Table);
 
 
+/*******************************************************************************
+ *
+ * FUNCTION:    AcDeleteTableList
+ *
+ * PARAMETERS:  ListHead            - List to delete
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Delete a list of tables. This is useful for removing memory
+ *              allocated by AcGetAllTablesFromFile
+ *
+ ******************************************************************************/
+
+void
+AcDeleteTableList (
+    ACPI_NEW_TABLE_DESC     *ListHead)
+{
+    ACPI_NEW_TABLE_DESC     *Current = ListHead;
+    ACPI_NEW_TABLE_DESC     *Previous = Current;
+
+
+    while (Current)
+    {
+        Current = Current->Next;
+        AcpiOsFree (Previous);
+        Previous = Current;
+    }
+}
+
+
 /*******************************************************************************
  *
  * FUNCTION:    AcGetAllTablesFromFile

diff --git a/source/common/adisasm.c b/source/common/adisasm.c
@@ -408,6 +408,8 @@ AdAmlDisassemble (
         ACPI_FREE (Table);
     }
 
+    AcDeleteTableList (ListHead);
+
     if (File)
     {
         fclose (File);
@@ -748,6 +750,7 @@ AdDoExternalFileList (
                 continue;
             }
 
+            AcDeleteTableList (ExternalListHead);
             return (Status);
         }
 
@@ -761,6 +764,7 @@ AdDoExternalFileList (
             {
                 AcpiOsPrintf ("Could not parse external ACPI tables, %s\n",
                     AcpiFormatException (Status));
+                AcDeleteTableList (ExternalListHead);
                 return (Status);
             }
 
@@ -780,6 +784,8 @@ AdDoExternalFileList (
         ExternalFileList = ExternalFileList->Next;
     }
 
+    AcDeleteTableList (ExternalListHead);
+
     if (ACPI_FAILURE (GlobalStatus))
     {
         return (GlobalStatus);

diff --git a/source/include/acapps.h b/source/include/acapps.h
@@ -226,6 +226,10 @@ AcGetAllTablesFromFile (
     UINT8                   GetOnlyAmlTables,
     ACPI_NEW_TABLE_DESC     **ReturnListHead);
 
+void
+AcDeleteTableList (
+    ACPI_NEW_TABLE_DESC     *ListHead);
+
 BOOLEAN
 AcIsFileBinary (
     FILE                    *File);

diff --git a/source/tools/acpiexec/aemain.c b/source/tools/acpiexec/aemain.c
@@ -792,5 +792,6 @@ main (
 
 ErrorExit:
     (void) AcpiOsTerminate ();
+    AcDeleteTableList (ListHead);
     return (ExitCode);
 }
diff --git a/source/tools/acpinames/anmain.c b/source/tools/acpinames/anmain.c
@@ -409,5 +409,6 @@ AnDumpEntireNamespace (
     Status = AcpiGetHandle (NULL, "\\_GPE", &Handle);
     ACPI_CHECK_OK (AcpiGetHandle, Status);
 
+    AcDeleteTableList (ListHead);
     return (0);
 }