2010-02-24 Vladimir Serbinenko <phcoder@gmail.com>

	* normal/crypto.c (read_crypto_list): Fix a memory leak.
	* normal/term.c (read_terminal_list): Likewise.
	* normal/main.c (grub_normal_init_page): Likewise.
	(grub_normal_read_line_real): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 35ecc7073ed19a6b7a89fb69abbf727ea549f34a..24981a5fc937f69d48a2f532e6ddaa5ec4390b31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * normal/crypto.c (read_crypto_list): Fix a memory leak.
+       * normal/term.c (read_terminal_list): Likewise.
+       * normal/main.c (grub_normal_init_page): Likewise.
+       (grub_normal_read_line_real): Likewise.
+
 2010-02-24  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * loader/i386/multiboot_mbi.c (grub_multiboot_set_bootdev): Fix a

diff --git a/normal/crypto.c b/normal/crypto.c
index 932f26f973e0f93fbf928f099383f58aa45113de..95899fbd5e1bd264efa33d9a2a5f445b8d3d1381 100644 (file)
--- a/normal/crypto.c
+++ b/normal/crypto.c
@@ -88,6 +88,7 @@ read_crypto_list (void)
     }
 
   file = grub_file_open (filename);
+  grub_free (filename);
   if (!file)
     {
       grub_errno = GRUB_ERR_NONE;

diff --git a/normal/main.c b/normal/main.c
index 9f8c127730cba1f4a1cad3685e0427a6ad420424..2306427fc02c08caf79fb461fd15568fea606842 100644 (file)
--- a/normal/main.c
+++ b/normal/main.c
@@ -418,6 +418,7 @@ grub_normal_init_page (struct grub_term_output *term)
  
   msg_len = grub_utf8_to_ucs4_alloc (msg_formatted,
                                     &unicode_msg, &last_position);
+  grub_free (msg_formatted);
  
   if (msg_len < 0)
     {
@@ -582,10 +583,13 @@ grub_normal_read_line_real (char **line, int cont, int nested)
       if (cont || nested)
        {
          grub_free (*line);
+         grub_free (prompt);
          *line = 0;
          return grub_errno;
        }
     }
+  
+  grub_free (prompt);
 
   return 0;
 }

diff --git a/normal/term.c b/normal/term.c
index 42201fbb34ab6641cf9d84edc6901315e07312da..e31d403eed058cb8ad0b13fad7afdeb1654ac79f 100644 (file)
--- a/normal/term.c
+++ b/normal/term.c
@@ -175,6 +175,7 @@ read_terminal_list (void)
     }
 
   file = grub_file_open (filename);
+  grub_free (filename);
   if (!file)
     {
       grub_errno = GRUB_ERR_NONE;