[1704] 2008-07-14 Pavel Roskin <address@hidden>

[Pavel Roskin]

Revision: 1704
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=1704
Author:   proski
Date:     2008-07-14 05:03:19 +0000 (Mon, 14 Jul 2008)

Log Message:
-----------
2008-07-14  Pavel Roskin  <address@hidden>

        * kern/env.c (grub_register_variable_hook): Don't copy empty
        string, it leaks memory.  Pass "" to grub_env_set(), it should
        handle constant strings.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/kern/env.c

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2008-07-14 04:46:19 UTC (rev 1703)
+++ trunk/grub2/ChangeLog       2008-07-14 05:03:19 UTC (rev 1704)
@@ -1,5 +1,9 @@
 2008-07-14  Pavel Roskin  <address@hidden>
 
+       * kern/env.c (grub_register_variable_hook): Don't copy empty
+       string, it leaks memory.  Pass "" to grub_env_set(), it should
+       handle constant strings.
+
        * commands/blocklist.c (grub_cmd_blocklist): Fix format warning.
        * commands/cmp.c (grub_cmd_cmp): Likewise.
        * kern/dl.c (grub_dl_flush_cache): Likewise.

Modified: trunk/grub2/kern/env.c
===================================================================
--- trunk/grub2/kern/env.c      2008-07-14 04:46:19 UTC (rev 1703)
+++ trunk/grub2/kern/env.c      2008-07-14 05:03:19 UTC (rev 1704)
@@ -331,14 +331,9 @@
 
   if (! var)
     {
-      char *val = grub_strdup ("");
-
-      if (! val)
+      if (grub_env_set (name, "") != GRUB_ERR_NONE)
        return grub_errno;
       
-      if (grub_env_set (name, val) != GRUB_ERR_NONE)
-       return grub_errno;
-      
       var = grub_env_find (name);
       /* XXX Insert an assertion?  */
     }