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

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

[Ville Nuorvala]

Hi,

there apparently are a couple of places where the bluez-utils is leaking 
memory after calling textfile_get(). The patch below should fix this...

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 11:23:14 -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 11:23:14 -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;


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


-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

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

[Marcel Holtmann]

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.

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel

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

[Ville Nuorvala]

[-- 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;

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

[Ville Nuorvala]

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

Sorry, I forgot to include stdlib.h in test_textfile.c. Please use this 
updated patch file...

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_fixed.patch --]
[-- Type: text/x-patch, Size: 1247 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 17:10:05 -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 17:10:05 -0000
@@ -35,7 +35,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
-
+#include <stdlib.h>
 #include "textfile.h"
 
 int main(int argc, char *argv[])
@@ -64,6 +64,8 @@
 		str = textfile_get(filename, key);
 		if (!str)
 			fprintf(stderr, "No value for %s\n", key);
+		else
+			free(str);
 	}
 
 	return 0;

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

[Marcel Holtmann]

Hi Ville,

> Sorry, I forgot to include stdlib.h in test_textfile.c. Please use this 
> updated patch file...

ok, this one is now in the CVS. Thanks for looking at it. More fixes for
memory leaks are welcome ;)

Regards

Marcel




-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Bluez-devel mailing list
Bluez-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bluez-devel