[flashrom] [commit] r1357 - trunk

[repository service]

Author: stefanct
Date: Sun Jun 26 22:45:35 2011
New Revision: 1357
URL: http://flashrom.org/trac/flashrom/changeset/1357

Log:
fix memleaks due to incorrect usage of flashbuses_to_text

Signed-off-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>

Modified:
   trunk/chipset_enable.c
   trunk/flashrom.c
   trunk/print.c
   trunk/print_wiki.c

Modified: trunk/chipset_enable.c
==============================================================================
--- trunk/chipset_enable.c	Sun Jun 26 20:28:58 2011	(r1356)
+++ trunk/chipset_enable.c	Sun Jun 26 22:45:35 2011	(r1357)
@@ -1206,6 +1206,7 @@
 	struct pci_dev *dev = NULL;
 	int ret = -2;		/* Nothing! */
 	int i;
+	char *s;
 
 	/* Now let's try to find the chipset we have... */
 	for (i = 0; chipset_enables[i].vendor_name != NULL; i++) {
@@ -1244,8 +1245,9 @@
 			msg_pinfo("PROBLEMS, continuing anyway\n");
 	}
 
-	msg_pinfo("This chipset supports the following protocols: %s.\n",
-	       flashbuses_to_text(buses_supported));
+	s = flashbuses_to_text(buses_supported);
+	msg_pinfo("This chipset supports the following protocols: %s.\n", s);
+	free(s);
 
 	return ret;
 }

Modified: trunk/flashrom.c
==============================================================================
--- trunk/flashrom.c	Sun Jun 26 20:28:58 2011	(r1356)
+++ trunk/flashrom.c	Sun Jun 26 22:45:35 2011	(r1357)
@@ -1186,10 +1186,11 @@
 #endif
 		snprintf(location, sizeof(location), "on %s", programmer_table[programmer].name);
 
+	tmp = flashbuses_to_text(flash->bustype);
 	msg_cinfo("%s chip \"%s %s\" (%d kB, %s) %s.\n",
-	       force ? "Assuming" : "Found",
-	       fill_flash->vendor, fill_flash->name, fill_flash->total_size,
-	       flashbuses_to_text(fill_flash->bustype), location);
+		  force ? "Assuming" : "Found", fill_flash->vendor,
+		  fill_flash->name, fill_flash->total_size, tmp, location);
+	free(tmp);
 
 	/* Flash registers will not be mapped if the chip was forced. Lock info
 	 * may be stored in registers, so avoid lock info printing.

Modified: trunk/print.c
==============================================================================
--- trunk/print.c	Sun Jun 26 20:28:58 2011	(r1356)
+++ trunk/print.c	Sun Jun 26 22:45:35 2011	(r1357)
@@ -28,7 +28,7 @@
 
 /*
  * Return a string corresponding to the bustype parameter.
- * Memory is obtained with malloc() and can be freed with free().
+ * Memory is obtained with malloc() and must be freed with free() by the caller.
  */
 char *flashbuses_to_text(enum chipbustype bustype)
 {
@@ -80,6 +80,7 @@
 	int maxvendorlen = strlen("Vendor") + 1;
 	int maxchiplen = strlen("Device") + 1;
 	const struct flashchip *f;
+	char *s;
 
 	for (f = flashchips; f->name != NULL; f++) {
 		/* Ignore "unknown XXXX SPI chip" entries. */
@@ -152,7 +153,10 @@
 		msg_ginfo("%d", f->total_size);
 		for (i = 0; i < 10 - digits(f->total_size); i++)
 			msg_ginfo(" ");
-		msg_ginfo("%s\n", flashbuses_to_text(f->bustype));
+
+		s = flashbuses_to_text(f->bustype);
+		msg_ginfo("%s\n", s);
+		free(s);
 	}
 }
 

Modified: trunk/print_wiki.c
==============================================================================
--- trunk/print_wiki.c	Sun Jun 26 20:28:58 2011	(r1356)
+++ trunk/print_wiki.c	Sun Jun 26 22:45:35 2011	(r1357)
@@ -203,6 +203,7 @@
 	int i = 0, c = 1, chipcount = 0;
 	const struct flashchip *f, *old = NULL;
 	uint32_t t;
+	char *s;
 
 	for (f = flashchips; f->name != NULL; f++)
 		chipcount++;
@@ -221,10 +222,11 @@
 			c = !c;
 
 		t = f->tested;
+		s = flashbuses_to_text(f->bustype);
 		printf("|- bgcolor=\"#%s\"\n| %s || %s || %d "
 		       "|| %s || {{%s}} || {{%s}} || {{%s}} || {{%s}}\n",
 		       (c == 1) ? "eeeeee" : "dddddd", f->vendor, f->name,
-		       f->total_size, flashbuses_to_text(f->bustype),
+		       f->total_size, s,
 		       (t & TEST_OK_PROBE) ? "OK" :
 		       (t & TEST_BAD_PROBE) ? "No" : "?3",
 		       (t & TEST_OK_READ) ? "OK" :
@@ -233,6 +235,7 @@
 		       (t & TEST_BAD_ERASE) ? "No" : "?3",
 		       (t & TEST_OK_WRITE) ? "OK" :
 		       (t & TEST_BAD_WRITE) ? "No" : "?3");
+		free(s);
 
 		/* Split table into 'cols' columns. */
 		if (i >= (chipcount / cols + 1)) {