vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
and don't mark error strings for translation.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-03 23:23:00 +02:00
parent 7d93298ff6
commit 498d503316
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2013-10-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/disk/uboot/ubootdisk.c (uboot_disk_open): Use grub_error * grub-core/disk/uboot/ubootdisk.c (uboot_disk_open): Use grub_error

12
grub-core/gfxmenu/theme_loader.c
View file

@ -197,8 +197,8 @@ theme_set_string (grub_gfxmenu_view_t view,
GRUB_VIDEO_BITMAP_SELECTION_METHOD_FITHEIGHT; GRUB_VIDEO_BITMAP_SELECTION_METHOD_FITHEIGHT;
else else
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
_("Unsupported scale method: %s"), "Unsupported scale method: %s",
grub_strdup (value)); value);
} }
else if (! grub_strcmp ("desktop-image-h-align", name)) 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; view->desktop_image_h_align = GRUB_VIDEO_BITMAP_H_ALIGN_RIGHT;
else else
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
_("Unsupported horizontal align method: %s"), "Unsupported horizontal align method: %s",
grub_strdup (value)); value);
} }
else if (! grub_strcmp ("desktop-image-v-align", name)) 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; view->desktop_image_v_align = GRUB_VIDEO_BITMAP_V_ALIGN_BOTTOM;
else else
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
_("Unsupported vertical align method: %s"), "Unsupported vertical align method: %s",
grub_strdup (value)); value);
} }
else if (! grub_strcmp ("desktop-color", name)) else if (! grub_strcmp ("desktop-color", name))
grub_video_parse_color (value, &view->desktop_color); grub_video_parse_color (value, &view->desktop_color);