diff --git a/ChangeLog b/ChangeLog
index 302365bf4..f00af145e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/normal/dyncmd.c (read_command_list): Don't access freed
+	space.
+
 2012-06-11  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	Remove non-functional EFI grub_get_rtc. Put a better fatal message
diff --git a/grub-core/normal/dyncmd.c b/grub-core/normal/dyncmd.c
index 2e473b9ea..169c126f5 100644
--- a/grub-core/normal/dyncmd.c
+++ b/grub-core/normal/dyncmd.c
@@ -122,8 +122,8 @@ read_command_list (const char *prefix)
 			last->next = ptr->next;
 		      else
 			grub_command_list = ptr->next;
-		      grub_free (ptr);
 		      grub_free (ptr->data); /* extcmd struct */
+		      grub_free (ptr);
 		    }
 		  else
 		    last = ptr;