dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

ACPICA: Fix possible memory leak in nspredef 

Fixed a possible leak when an attempt is made to repair a return
object.  The only current repair is an automatic buffer to string
conversion.

Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Bob Moore 2009-06-24 11:22:22 +08:00 committed by Len Brown
parent 15b8dd53f5
commit dbdc8f02fe
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/acpi/acpica/nspredef.c
View File

@ -1046,22 +1046,25 @@ acpi_ns_repair_object(u32 expected_btypes,
ACPI_MEMCPY(new_object->string.pointer,
return_object->buffer.pointer, length);
/* Install the new return object */
/*
* If the original object is a package element, we need to:
* 1. Set the reference count of the new object to match the
* reference count of the old object.
* 2. Decrement the reference count of the original object.
*/
if (package_index != ACPI_NOT_PACKAGE) {
new_object->common.reference_count =
return_object->common.reference_count;
if (return_object->common.reference_count > 1) {
return_object->common.reference_count--;
}
}
/* Delete old object, install the new return object */
acpi_ut_remove_reference(return_object);
*return_object_ptr = new_object;
/*
* If the object is a package element, we need to:
* 1. Decrement the reference count of the orignal object, it was
* incremented when building the package
* 2. Increment the reference count of the new object, it will be
* decremented when releasing the package
*/
if (package_index != ACPI_NOT_PACKAGE) {
acpi_ut_remove_reference(return_object);
acpi_ut_add_reference(new_object);
}
return (AE_OK);
default: