* grub-core/gfxmenu/theme_loader.c (theme_set_string): Fix memory leak

	and don't mark error strings for translation.

diff --git a/ChangeLog b/ChangeLog
index 1b8e704a7cef6b749e4e7220c0ada48ba7f464c7..3368f46dbdc3a23b715132805b626d1848d7c3ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-10-03  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/gfxmenu/theme_loader.c (theme_set_string): Fix memory leak
+       and don't mark error strings for translation.
+
 2013-10-03  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/disk/uboot/ubootdisk.c (uboot_disk_open): Use grub_error

diff --git a/grub-core/gfxmenu/theme_loader.c b/grub-core/gfxmenu/theme_loader.c
index 09fab20400ba2762280156388bd3d14089067971..8a7945816114c50d8af27cb7d74e38391456296d 100644 (file)
--- a/grub-core/gfxmenu/theme_loader.c
+++ b/grub-core/gfxmenu/theme_loader.c
@@ -197,8 +197,8 @@ theme_set_string (grub_gfxmenu_view_t view,
             GRUB_VIDEO_BITMAP_SELECTION_METHOD_FITHEIGHT;
       else
         return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                           _("Unsupported scale method: %s"),
-                           grub_strdup (value));
+                           "Unsupported scale method: %s",
+                           value);
     }
   else if (! grub_strcmp ("desktop-image-h-align", name))
     {
@@ -210,8 +210,8 @@ theme_set_string (grub_gfxmenu_view_t view,
         view->desktop_image_h_align = GRUB_VIDEO_BITMAP_H_ALIGN_RIGHT;
       else
         return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                           _("Unsupported horizontal align method: %s"),
-                           grub_strdup (value));
+                           "Unsupported horizontal align method: %s",
+                           value);
     }
   else if (! grub_strcmp ("desktop-image-v-align", name))
     {
@@ -223,8 +223,8 @@ theme_set_string (grub_gfxmenu_view_t view,
         view->desktop_image_v_align = GRUB_VIDEO_BITMAP_V_ALIGN_BOTTOM;
       else
         return grub_error (GRUB_ERR_BAD_ARGUMENT,
-                           _("Unsupported vertical align method: %s"),
-                           grub_strdup (value));
+                           "Unsupported vertical align method: %s",
+                           value);
     }
   else if (! grub_strcmp ("desktop-color", name))
      grub_video_parse_color (value, &view->desktop_color);