* grub-core/commands/videotest.c (grub_cmd_videotest): Check that

	allocation succeeded.

diff --git a/ChangeLog b/ChangeLog
index 833d80a8a67b7ab58215f0a6f1c81d19b09184ac..7ea8d10016b588544e92df4479f648721cbc3c89 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/commands/videotest.c (grub_cmd_videotest): Check that
+       allocation succeeded.
+
 2011-12-13  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/fs/iso9660.c (grub_iso9660_convert_string): Make first

diff --git a/grub-core/commands/videotest.c b/grub-core/commands/videotest.c
index dc7a6485f98320a7e7a812d7a27139e8646462d6..11949a6fc2c1296bcfe90109f8d4606ee1375cde 100644 (file)
--- a/grub-core/commands/videotest.c
+++ b/grub-core/commands/videotest.c
@@ -74,6 +74,8 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
     grub_video_create_render_target (&text_layer, width, height,
                                     GRUB_VIDEO_MODE_TYPE_RGB
                                     | GRUB_VIDEO_MODE_TYPE_ALPHA);
+    if (!text_layer)
+      goto fail;
 
     grub_video_set_active_render_target (text_layer);
 
@@ -191,6 +193,11 @@ grub_cmd_videotest (grub_command_t cmd __attribute__ ((unused)),
 
   grub_errno = GRUB_ERR_NONE;
   return grub_errno;
+
+ fail:
+  grub_video_delete_render_target (text_layer);
+  grub_video_restore ();
+  return grub_errno;
 }
 
 static grub_command_t cmd;