[Libguestfs] [PATCH 2/2] Free memory buffers when not used

Pino Toscano ptoscano at redhat.com
Tue Jul 29 16:47:41 UTC 2014


While supermin is a short-lived application, some of the allocated
buffers depend on sizes from the filesystem being read, which could lead
to keep too much memory allocated and potentially not allowing supermin
to run properly.
---
 src/ext2fs-c.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/ext2fs-c.c b/src/ext2fs-c.c
index 99f4d3c..70755c9 100644
--- a/src/ext2fs-c.c
+++ b/src/ext2fs-c.c
@@ -511,6 +511,7 @@ read_whole_file (const char *filename, size_t size)
   if (fd == -1) {
     /* Skip unreadable files. */
     fprintf (stderr, "supermin: open: %s: %m\n", filename);
+    free (buf);
     return NULL;
   }
 
@@ -585,11 +586,12 @@ ext2_copy_file (ext2_filsys fs, const char *src, const char *dest)
    * is because the code was copied and pasted from supermin 4 where
    * there was no such distinction.
    */
-  const char *dirname, *basename;
+  char *dirname;
+  const char *basename;
   const char *p = strrchr (dest, '/');
   ext2_ino_t dir_ino;
   if (dest == p) {     /* "/foo" */
-    dirname = "/";
+    dirname = strdup ("/");
     basename = dest+1;
     dir_ino = EXT2_ROOT_INO;
   } else {                      /* "/foo/bar" */
@@ -630,6 +632,7 @@ ext2_copy_file (ext2_filsys fs, const char *src, const char *dest)
 	  new_dirname[len-1] == '\n')
 	new_dirname[len-1] = '\0';
 
+      free (dirname);
       dirname = new_dirname;
     }
   cont:
@@ -717,4 +720,6 @@ ext2_copy_file (ext2_filsys fs, const char *src, const char *dest)
                       major (statbuf.st_rdev), minor (statbuf.st_rdev),
                       dir_ft, NULL);
   }
+
+  free (dirname);
 }
-- 
1.9.3




More information about the Libguestfs mailing list