mirrors/acpica
1
0
Fork 0
mirror of https://github.com/acpica/acpica/ synced 2025-02-24 17:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix possible memory leak

Browse Source 
date	2004.11.03.20.16.00;	author rmoore1;	state Exp;
This commit is contained in:
aystarik 2005-06-29 19:06:08 +00:00
parent febfe269e0
commit efd73a85d5
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
source/components/utilities/utcopy.c
View File

@ -1,7 +1,7 @@
/******************************************************************************
*
* Module Name: utcopy - Internal to external object translation utilities
* $Revision: 1.113 $
* $Revision: 1.115 $
*
*****************************************************************************/
@ -9,7 +9,7 @@
*
* 1. Copyright Notice
*
* Some or all of this work - Copyright (c) 1999 - 2003, Intel Corp.
* Some or all of this work - Copyright (c) 1999 - 2004, Intel Corp.
* All rights reserved.
*
* 2. License
@ -507,25 +507,23 @@ AcpiUtCopyEsimpleToIsimple (
break;
default:
/*
* Whatever other type -- it is not supported
*/
/* All other types are not supported */
return_ACPI_STATUS (AE_SUPPORT);
}
switch (ExternalObject->Type)
{
/* Must COPY string and buffer contents */
switch (ExternalObject->Type)
{
case ACPI_TYPE_STRING:
InternalObject->String.Pointer =
ACPI_MEM_CALLOCATE ((ACPI_SIZE) ExternalObject->String.Length + 1);
if (!InternalObject->String.Pointer)
{
return_ACPI_STATUS (AE_NO_MEMORY);
goto ErrorExit;
}
ACPI_MEMCPY (InternalObject->String.Pointer,
@ -542,7 +540,7 @@ AcpiUtCopyEsimpleToIsimple (
ACPI_MEM_CALLOCATE (ExternalObject->Buffer.Length);
if (!InternalObject->Buffer.Pointer)
{
return_ACPI_STATUS (AE_NO_MEMORY);
goto ErrorExit;
}
ACPI_MEMCPY (InternalObject->Buffer.Pointer,
@ -565,6 +563,11 @@ AcpiUtCopyEsimpleToIsimple (
*RetInternalObject = InternalObject;
return_ACPI_STATUS (AE_OK);
ErrorExit:
AcpiUtRemoveReference (InternalObject);
return_ACPI_STATUS (AE_NO_MEMORY);
}
@ -845,7 +848,7 @@ AcpiUtCopyIelementToIelement (
Status = AcpiUtCopySimpleObject (SourceObject, TargetObject);
if (ACPI_FAILURE (Status))
{
return (Status);
goto ErrorExit;
}
*ThisTargetPtr = TargetObject;
@ -882,8 +885,8 @@ AcpiUtCopyIelementToIelement (
sizeof (void *));
if (!TargetObject->Package.Elements)
{
ACPI_MEM_FREE (TargetObject);
return (AE_NO_MEMORY);
Status = AE_NO_MEMORY;
goto ErrorExit;
}
/*
@ -903,6 +906,10 @@ AcpiUtCopyIelementToIelement (
}
return (Status);
ErrorExit:
AcpiUtRemoveReference (TargetObject);
return (Status);
}