Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a0ec91 authored by Lin Ming's avatar Lin Ming Committed by Len Brown
Browse files

ACPICA: Fixed a couple memory leaks associated with "implicit return" 

Fixed a couple memory leaks associated with "implicit return" objects
when the AML Interpreter slack mode is enabled.

http://www.acpica.org/bugzilla/show_bug.cgi?id=349



Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 68e125c4

drivers/acpi/dispatcher/dsmethod.c

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ acpi_ds_method_error(acpi_status status, struct acpi_walk_state *walk_state) 
						    NULL);

		acpi_ex_enter_interpreter();

	}



	acpi_ds_clear_implicit_return(walk_state);



#ifdef ACPI_DISASSEMBLER

	if (ACPI_FAILURE(status)) {

drivers/acpi/parser/psparse.c

+3 −1
Original line number Diff line number Diff line
@@ -635,10 +635,12 @@ acpi_status acpi_ps_parse_aml(struct acpi_walk_state *walk_state) 
					    ACPI_WALK_METHOD_RESTART;

				}

			} else {

				/* On error, delete any return object */

				/* On error, delete any return object or implicit return */



				acpi_ut_remove_reference(previous_walk_state->

							 return_desc);

				acpi_ds_clear_implicit_return

				    (previous_walk_state);

			}

		}