From 6809d8d187655328684f6245fbc24c55db4c0dcf Mon Sep 17 00:00:00 2001
From: Blue Swirl <blauwirbel@gmail.com>
Date: Tue, 28 Sep 2010 18:59:45 +0000
Subject: [PATCH] sun-parts: fix memory leakages

Free the string returned by my_args_copy() also in error cases.

Adjust string parsing to avoid strdup() calls.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

git-svn-id: svn://coreboot.org/openbios/trunk/openbios-devel@866 f158a5a8-5612-0410-a976-696ce0be7e32
---
 packages/sun-parts.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/sun-parts.c b/packages/sun-parts.c
index 8c1466c..532651c 100644
--- a/packages/sun-parts.c
+++ b/packages/sun-parts.c
@@ -92,8 +92,8 @@ static void
 sunparts_open( sunparts_info_t *di )
 {
 	char *str = my_args_copy();
-	char *argstr = strdup("");
-	char *parstr = strdup("");
+        char *argstr = NULL;
+        char *parstr = NULL;
 	int parnum = -1;
 	unsigned char buf[512];
         struct sun_disklabel *p;
@@ -140,7 +140,7 @@ sunparts_open( sunparts_info_t *di )
 			}
 		
 			/* Convert the id to a partition number */
-			if (strlen(parstr)) {
+                        if (parstr && strlen(parstr)) {
 				if (parstr[0] >= 'a' && parstr[0] < ('a' + 8))
 					parnum = parstr[0] - 'a';
 				else
@@ -156,12 +156,15 @@ sunparts_open( sunparts_info_t *di )
 	di->seek_xt = find_parent_method("seek");
 
 	SEEK( 0 );
-	if( READ(buf, 512) != 512 )
+        if (READ(buf, 512) != 512) {
+                free(str);
 		RET(0);
+        }
 
 	/* Check Magic */
 	if (!has_sun_part_magic(buf)) {
 		DPRINTF("Sun partition magic not found.\n");
+                free(str);
 		RET(0);
 	}
 
@@ -190,6 +193,7 @@ sunparts_open( sunparts_info_t *di )
         size = (long long)__be32_to_cpu(p->partitions[parnum].num_sectors) * bs;
         if (size == 0) {
                 DPRINTF("Partition size is 0, exiting\n");
+                free(str);
                 RET(0);
         }
         di->size_hi = size >> BITS;
@@ -213,7 +217,7 @@ sunparts_open( sunparts_info_t *di )
 
 		/* If we have been asked to open a particular file, interpose the filesystem package with 
 		   the passed filename as an argument */
-		if (strlen(argstr)) {
+                if (argstr && strlen(argstr)) {
 			push_str( argstr );
 			PUSH_ph( ph );
 			fword("interpose");
@@ -228,7 +232,7 @@ sunparts_open( sunparts_info_t *di )
 		feval("find-package");
 		ph = POP_ph();
 
-		if (ph) {
+                if (argstr && ph) {
 			ph = POP_ph();
 			push_str(argstr);
 			PUSH_ph(ph);