diff --git a/reactos/drivers/fs/cdfs/finfo.c b/reactos/drivers/fs/cdfs/finfo.c
index e7a993723ea..f8cfce101c1 100644
--- a/reactos/drivers/fs/cdfs/finfo.c
+++ b/reactos/drivers/fs/cdfs/finfo.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: finfo.c,v 1.6 2002/10/03 18:28:22 sedwards Exp $
+/* $Id: finfo.c,v 1.7 2002/11/20 21:55:25 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -403,7 +403,7 @@ CdfsSetInformation(PDEVICE_OBJECT DeviceObject,
 
   NTSTATUS Status = STATUS_SUCCESS;
 
-  DPRINT1("CdfsSetInformation() called\n");
+  DPRINT("CdfsSetInformation() called\n");
 
   Stack = IoGetCurrentIrpStackLocation(Irp);
   FileInformationClass = Stack->Parameters.SetFile.FileInformationClass;
diff --git a/reactos/drivers/fs/cdfs/rw.c b/reactos/drivers/fs/cdfs/rw.c
index 75dffcdff14..9fd313b302c 100644
--- a/reactos/drivers/fs/cdfs/rw.c
+++ b/reactos/drivers/fs/cdfs/rw.c
@@ -16,7 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id: rw.c,v 1.7 2002/10/01 19:27:16 chorns Exp $
+/* $Id: rw.c,v 1.8 2002/11/20 21:55:25 ekohl Exp $
  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel
@@ -68,11 +68,14 @@ CdfsReadFile(PDEVICE_EXTENSION DeviceExt,
   *LengthRead = 0;
 
   if (Length == 0)
-    return STATUS_SUCCESS;
+    return(STATUS_SUCCESS);
 
   Ccb = (PCCB)FileObject->FsContext2;
   Fcb = Ccb->Fcb;
 
+  if (ReadOffset >= Fcb->Entry.DataLengthL)
+    return(STATUS_END_OF_FILE);
+
   if (ReadOffset + Length > Fcb->Entry.DataLengthL)
     Length = Fcb->Entry.DataLengthL - ReadOffset;