From 9315f42c8f970f6e42b6821e28df4b52f8422e66 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Sun, 6 Apr 2014 15:43:06 +0000
Subject: [PATCH] [CDFS] - Fix broken if statement - Remove deadcode

CID #502181
CID #502438
CID #716663

svn path=/trunk/; revision=62660
---
 reactos/drivers/filesystems/cdfs/dirctl.c | 2 +-
 reactos/drivers/filesystems/cdfs/fsctl.c  | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/reactos/drivers/filesystems/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
index 9cccc3f319b..e8568e31d23 100644
--- a/reactos/drivers/filesystems/cdfs/dirctl.c
+++ b/reactos/drivers/filesystems/cdfs/dirctl.c
@@ -303,7 +303,7 @@ CdfsFindFile(PDEVICE_EXTENSION DeviceExt,
         if (FsRtlIsNameInExpression(&FileToFindUpcase, &LongName, TRUE, NULL) ||
             FsRtlIsNameInExpression(&FileToFindUpcase, &ShortName, TRUE, NULL))
         {
-            if (Parent && Parent->PathName)
+            if (Parent->PathName[0])
             {
                 len = wcslen(Parent->PathName);
                 memcpy(Fcb->PathName, Parent->PathName, len*sizeof(WCHAR));
diff --git a/reactos/drivers/filesystems/cdfs/fsctl.c b/reactos/drivers/filesystems/cdfs/fsctl.c
index 29cf1eddab3..9b658c76aaf 100644
--- a/reactos/drivers/filesystems/cdfs/fsctl.c
+++ b/reactos/drivers/filesystems/cdfs/fsctl.c
@@ -439,8 +439,6 @@ ByeBye:
             ObDereferenceObject(DeviceExt->StreamFileObject);
         if (Fcb)
             ExFreePool(Fcb);
-        if (Ccb)
-            ExFreePool(Ccb);
         if (NewDeviceObject)
             IoDeleteDevice(NewDeviceObject);
     }