From: Andrei Borzenkov <arvidjaar@gmail.com>
Date: Sat, 9 Jan 2016 10:43:04 +0000 (+0300)
Subject: gfxmenu: fix memory leak
X-Git-Tag: 2.02-beta3~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa2af21ec8fd4410f6a9bb7412c6402e1b6565ca;p=thirdparty%2Fgrub.git

gfxmenu: fix memory leak

Found by: Coverity scan.
CID: 73766
---

diff --git a/grub-core/gfxmenu/font.c b/grub-core/gfxmenu/font.c
index 64d52670b..756c24f20 100644
--- a/grub-core/gfxmenu/font.c
+++ b/grub-core/gfxmenu/font.c
@@ -45,6 +45,7 @@ grub_font_draw_string (const char *str, grub_font_t font,
   grub_uint32_t *logical;
   grub_ssize_t logical_len, visual_len;
   struct grub_unicode_glyph *visual, *ptr;
+  grub_err_t err;
 
   logical_len = grub_utf8_to_ucs4_alloc (str, &logical, 0);
   if (logical_len < 0)
@@ -56,24 +57,28 @@ grub_font_draw_string (const char *str, grub_font_t font,
   if (visual_len < 0)
     return grub_errno;
 
+  err = GRUB_ERR_NONE;
   for (ptr = visual, x = left_x; ptr < visual + visual_len; ptr++)
     {
-      grub_err_t err;
       struct grub_font_glyph *glyph;
       glyph = grub_font_construct_glyph (font, ptr);
       if (!glyph)
-	return grub_errno;
+	{
+	  err = grub_errno;
+	  goto out;
+	}
       err = grub_font_draw_glyph (glyph, color, x, baseline_y);
-      x += glyph->device_width;
       if (err)
-	return err;
+	goto out;
+      x += glyph->device_width;
     }
 
+out:
   for (ptr = visual; ptr < visual + visual_len; ptr++)
     grub_unicode_destroy_glyph (ptr);
   grub_free (visual);
 
-  return GRUB_ERR_NONE;
+  return err;
 }
 
 /* Get the width in pixels of the specified UTF-8 string, when rendered in