diff --git a/reactos/drivers/fs/cdfs/close.c b/reactos/drivers/fs/cdfs/close.c
index 6a2be3486fd..9ef0f0e27e5 100644
--- a/reactos/drivers/fs/cdfs/close.c
+++ b/reactos/drivers/fs/cdfs/close.c
@@ -69,7 +69,10 @@ CdfsCloseFile(PDEVICE_EXTENSION DeviceExt,
       CdfsReleaseFCB(DeviceExt, FileObject->FsContext);
     }
 
-  RtlFreeUnicodeString(&Ccb->DirectorySearchPattern);
+  if (Ccb->DirectorySearchPattern.Buffer)
+    {
+      ExFreePool(Ccb->DirectorySearchPattern.Buffer);
+    }
   ExFreePool(Ccb);
 
   return(STATUS_SUCCESS);
diff --git a/reactos/drivers/fs/cdfs/create.c b/reactos/drivers/fs/cdfs/create.c
index 19a2285fe47..4a96e84c48a 100644
--- a/reactos/drivers/fs/cdfs/create.c
+++ b/reactos/drivers/fs/cdfs/create.c
@@ -183,8 +183,8 @@ CdfsOpenFile(PDEVICE_EXTENSION DeviceExt,
 				     Fcb,
 				     FileObject);
 
-  if (FileName == &AbsFileName)
-    RtlFreeUnicodeString(&AbsFileName);
+  if ((FileName == &AbsFileName) && AbsFileName.Buffer)
+    ExFreePool(AbsFileName.Buffer);
 
   return Status;
 }