[PATCH] Revert "acpi: s3: free quirks and command resources"

Colin King colin.king at canonical.com
Mon May 20 10:08:30 UTC 2013


From: Colin Ian King <colin.king at canonical.com>

This fix is bogus and causes a double free. Revert it.

This reverts commit 33cca4e48b90e1c5c8d660bb288f57f0c9596b58.
---
 src/acpi/s3/s3.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/acpi/s3/s3.c b/src/acpi/s3/s3.c
index 459cc97..ad1f564 100644
--- a/src/acpi/s3/s3.c
+++ b/src/acpi/s3/s3.c
@@ -73,8 +73,8 @@ static int s3_do_suspend_resume(fwts_framework *fw,
 	int differences;
 	time_t t_start;
 	time_t t_end;
-	char *command = NULL;
-	char *quirks = NULL;
+	char *command;
+	char *quirks;
 	char buffer[80];
 
 	fwts_klog_clear();
@@ -184,11 +184,6 @@ static int s3_do_suspend_resume(fwts_framework *fw,
 		fwts_tag_failed(fw, FWTS_TAG_POWER_MANAGEMENT);
 	}
 
-	if (command)
-		free(command);
-	if (quirks)
-		free(quirks);
-
 	return FWTS_OK;
 }
 
-- 
1.8.1.2




More information about the fwts-devel mailing list