diff --git a/ChangeLog b/ChangeLog
index 4d3987ecf..d53f92215 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-10-11  Marco Gerards  <mgerards@xs4all.nl>
+
+	* fs/sfs.c (grub_sfs_open): Don't free `data->label' if it is not
+	allocated.
+	(grub_sfs_dir): Likewise.
+
 2005-10-09  Marco Gerards  <mgerards@xs4all.nl>
 
 	Add support for the SFS filesystem.
diff --git a/fs/sfs.c b/fs/sfs.c
index 83fc0e903..23640e2d6 100644
--- a/fs/sfs.c
+++ b/fs/sfs.c
@@ -485,7 +485,8 @@ grub_sfs_open (struct grub_file *file, const char *name)
  fail:
   if (data && fdiro != &data->diropen)
     grub_free (fdiro);
-  grub_free (data->label);
+  if (data)
+    grub_free (data->label);
   grub_free (data);
   
 #ifndef GRUB_UTIL
@@ -565,7 +566,8 @@ grub_sfs_dir (grub_device_t device, const char *path,
  fail:
   if (data && fdiro != &data->diropen)
     grub_free (fdiro);
-  grub_free (data->label);
+  if (data)
+    grub_free (data->label);
   grub_free (data);
 
 #ifndef GRUB_UTIL