Changeset 1357 for trunk/print.c

Timestamp:

Jun 26, 2011 10:45:35 PM (2 years ago)

Author:

stefanct

Message:

fix memleaks due to incorrect usage of flashbuses_to_text

Signed-off-by: Stefan Tauner <stefan.tauner@…>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>

File:

• trunk/print.c (modified) (3 diffs)

trunk/print.c

@@ -29 +29 @@
 /*
  * 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)
@@ -81 +81 @@
         int maxchiplen = strlen("Device") + 1;
         const struct flashchip *f;
+        char *s;
 
         for (f = flashchips; f->name != NULL; f++) {
@@ -153 +154 @@
                 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);
         }
 }