From 498d5033166a89431b7bb3556751a9758d5db2c0 Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Thu, 3 Oct 2013 23:23:00 +0200 Subject: [PATCH] * grub-core/gfxmenu/theme_loader.c (theme_set_string): Fix memory leak and don't mark error strings for translation. --- ChangeLog | 5 +++++ grub-core/gfxmenu/theme_loader.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1b8e704a7..3368f46db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-10-03 Vladimir Serbinenko + + * 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 * 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 09fab2040..8a7945816 100644 --- 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);