diff --git a/ChangeLog b/ChangeLog
index 66c55d101..c267a8a0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/lib/reed_solomon.c (rs_recover): Prevent memory leak.
+	(main): Close file.
+
 2011-06-23  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/loader/i386/xnu.c (grub_cpu_xnu_fill_devprop): Don't attempt
diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
index e500ba32d..8b5e8235a 100644
--- a/grub-core/lib/reed_solomon.c
+++ b/grub-core/lib/reed_solomon.c
@@ -265,6 +265,22 @@ rs_recover (gf_single_t *m, grub_size_t s, grub_size_t rs)
 
   syndroms (m, s, rs, sy);
 
+  for (i = 0; i < (int) rs; i++)
+    if (sy[i] != 0)
+      break;
+
+  /* No error detected.  */
+  if (i == (int) rs)
+    {
+#ifndef STANDALONE
+      free (sigma);
+      free (errpot);
+      free (errpos);
+      free (sy);
+#endif
+      return;
+    }
+
   {
     gf_single_t *eq;
 
@@ -275,14 +291,6 @@ rs_recover (gf_single_t *m, grub_size_t s, grub_size_t rs)
     scratch += rs2 * (rs2 + 1) * sizeof (gf_single_t);
 #endif
 
-    for (i = 0; i < (int) rs; i++)
-      if (sy[i] != 0)
-	break;
-
-    /* No error detected.  */
-    if (i == (int) rs)
-      return;
-
     for (i = 0; i < (int) rs2; i++)
       for (j = 0; j < (int) rs2 + 1; j++)
 	eq[i * (rs2 + 1) + j] = sy[i+j];
@@ -504,6 +512,7 @@ main (int argc, char **argv)
   rs = s / 3;
   buf = xmalloc (s + rs + SECTOR_SIZE);
   fread (buf, 1, s, in);
+  fclose (in);
 
   grub_reed_solomon_add_redundancy (buf, s, rs);