From 2130f6ee4b2b2116f7f3ac60a17aa07d0ac44299 Mon Sep 17 00:00:00 2001
From: Pierre Schweitzer <pierre@reactos.org>
Date: Mon, 5 Jun 2017 13:00:58 +0000
Subject: [PATCH] [UDFS] Misc coverity fixes. CID 1412011, 1321904, 1322008,
 1322151, 1321905

CORE-4375

svn path=/trunk/; revision=74921
---
 reactos/drivers/filesystems/udfs/fileinfo.cpp         | 2 +-
 reactos/drivers/filesystems/udfs/namesup.cpp          | 4 ++--
 reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp | 1 +
 reactos/drivers/filesystems/udfs/udf_info/extent.cpp  | 1 +
 reactos/drivers/filesystems/udfs/udf_info/mount.cpp   | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/reactos/drivers/filesystems/udfs/fileinfo.cpp b/reactos/drivers/filesystems/udfs/fileinfo.cpp
index bb611e517c6..cb87cf42c50 100644
--- a/reactos/drivers/filesystems/udfs/fileinfo.cpp
+++ b/reactos/drivers/filesystems/udfs/fileinfo.cpp
@@ -1242,7 +1242,7 @@ UDFMarkStreamsForDeletion(
                                                         UDF_FCB_DELETE_PARENT);
                         } else {
                             AdPrint(("    CLEAR stream DeleteOnClose\n"));
-                            FileInfo->Fcb->FCBFlags &= !(UDF_FCB_DELETE_ON_CLOSE |
+                            FileInfo->Fcb->FCBFlags &= ~(UDF_FCB_DELETE_ON_CLOSE |
                                                          UDF_FCB_DELETE_PARENT);
                         }
                     }
diff --git a/reactos/drivers/filesystems/udfs/namesup.cpp b/reactos/drivers/filesystems/udfs/namesup.cpp
index b1a30271ab7..a028f283f87 100644
--- a/reactos/drivers/filesystems/udfs/namesup.cpp
+++ b/reactos/drivers/filesystems/udfs/namesup.cpp
@@ -241,7 +241,7 @@ UDFIsMatchAllMask(
             if((*Buffer) != DOS_QM)
                 return FALSE;
         }
-        if(*DosOpen)
+        if(DosOpen)
             *DosOpen = TRUE;
         return TRUE;
     } else
@@ -253,7 +253,7 @@ UDFIsMatchAllMask(
             return FALSE;
         if(Buffer[2] != DOS_STAR)
             return FALSE;
-        if(*DosOpen)
+        if(DosOpen)
             *DosOpen = TRUE;
         return TRUE;
     } else {
diff --git a/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp b/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp
index fdb0e528b7f..0f425c7032d 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp
+++ b/reactos/drivers/filesystems/udfs/udf_info/dirtree.cpp
@@ -612,6 +612,7 @@ UDFIndexDirectory(
     if(DirNdx->FileEntryLoc.logicalBlockNum == (ULONG)-1) {
         DirPrint(("  err: FileEntryLoc=-1\n"));
         DbgFreePool(buff);
+        UDFDirIndexFree(hDirNdx);
         return STATUS_FILE_CORRUPT_ERROR;
     }
     DirNdx->FileCharacteristics = (FileInfo->FileIdent) ?
diff --git a/reactos/drivers/filesystems/udfs/udf_info/extent.cpp b/reactos/drivers/filesystems/udfs/udf_info/extent.cpp
index 4d55137b294..8c76c2b0188 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/extent.cpp
+++ b/reactos/drivers/filesystems/udfs/udf_info/extent.cpp
@@ -2640,6 +2640,7 @@ UDFBuildAllocDescs(
     InitSz = Vcb->LBlockSize - FileInfo->Dloc->FileEntryLen;
     Allocs = (int8*)MyAllocatePool__(NonPagedPool, InitSz);
     if(!Allocs) {
+        *AllocData = NULL;
         AdPrint(("BuildAllocDesc: cant alloc %x bytes for Allocs\n", InitSz));
         return STATUS_INSUFFICIENT_RESOURCES;
     }
diff --git a/reactos/drivers/filesystems/udfs/udf_info/mount.cpp b/reactos/drivers/filesystems/udfs/udf_info/mount.cpp
index 28583a426b1..df10a56215f 100644
--- a/reactos/drivers/filesystems/udfs/udf_info/mount.cpp
+++ b/reactos/drivers/filesystems/udfs/udf_info/mount.cpp
@@ -391,7 +391,7 @@ UDFUpdateLogicalVolInt(
     LVID_iUse = UDFGetLVIDiUse(Vcb);
 
     if((LVID_iUse->minUDFReadRev  == Vcb->minUDFReadRev) &&
-       (LVID_iUse->minUDFReadRev  == Vcb->minUDFReadRev) &&
+       (LVID_iUse->minUDFWriteRev == Vcb->minUDFWriteRev) &&
        (LVID_iUse->maxUDFWriteRev == Vcb->maxUDFWriteRev) &&
        (LVID_iUse->numFiles == Vcb->numFiles) &&
        (LVID_iUse->numDirs  == Vcb->numDirs))
-- 
2.17.1