Re: [Bluez-devel] [PATCH] Fix memory textfile_get() memory leaks

[Ville Nuorvala <vnuorval@tcs.hut.fi>]

[-- Attachment #1: Type: text/plain, Size: 610 bytes --]

Marcel Holtmann wrote:
> Hi Ville,
> 
> 
>>there apparently are a couple of places where the bluez-utils is leaking 
>>memory after calling textfile_get(). The patch below should fix this...
> 
> 
> coding style, coding style, coding style !!!
> 
> We use tabs instead of whitespaces. This means your patch is wrong or
> your mailer screwed it up.

Sorry, the tabs got screwed up. The attached patch should be acceptable.

Regards,
Ville
-- 
Ville Nuorvala
Research Assistant,
Laboratory for Theoretical Computer Science,
Helsinki University of Technology
email: vnuorval@tcs.hut.fi, phone: +358 (0)9 451 5257

[-- Attachment #2: mem_leak.patch --]
[-- Type: text/x-patch, Size: 1085 bytes --]

Index: hcid/storage.c
===================================================================
RCS file: /cvsroot/bluez/utils/hcid/storage.c,v
retrieving revision 1.24
diff -u -r1.24 storage.c
--- hcid/storage.c	30 Aug 2005 00:35:39 -0000	1.24
+++ hcid/storage.c	7 Sep 2005 14:36:58 -0000
@@ -87,6 +87,8 @@
 		str[248] = '\0';
 	strcpy(name, str);
 
+	free(str);
+
 	return 0;
 }
 
@@ -161,6 +163,7 @@
 		memcpy(tmp, str + (i * 2), 2);
 		key[i] = (uint8_t) strtol(tmp, NULL, 16);
 	}
+	free(str);
 
 	return 0;
 }
@@ -181,5 +184,7 @@
 	strncpy(pin, str, 16);
 	len = strlen(pin);
 
+	free(str);
+
 	return len;
 }
Index: common/test_textfile.c
===================================================================
RCS file: /cvsroot/bluez/utils/common/test_textfile.c,v
retrieving revision 1.2
diff -u -r1.2 test_textfile.c
--- common/test_textfile.c	6 Aug 2005 06:27:40 -0000	1.2
+++ common/test_textfile.c	7 Sep 2005 14:36:58 -0000
@@ -64,6 +64,8 @@
 		str = textfile_get(filename, key);
 		if (!str)
 			fprintf(stderr, "No value for %s\n", key);
+		else
+			free(str);
 	}
 
 	return 0;