From 5d1f213dadd6893af0014d55b0519d08c5b4e791 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Fri, 20 Jan 2017 22:49:44 +0100
Subject: Dep/CascLib: Update to
 ladislav-zezula/CascLib@a03e2a397d62451ed8576b883fe32ed04add7701

Fixes coverity issues:
CID 1254550
CID 1254603
CID 1254604
CID 1264604
CID 1254544
---
 dep/CascLib/src/common/FileStream.cpp | 13 +++++++++++--
 dep/CascLib/src/common/ListFile.cpp   |  7 +++++--
 dep/CascLib/src/common/Map.cpp        |  4 +++-
 3 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'dep/CascLib/src')

diff --git a/dep/CascLib/src/common/FileStream.cpp b/dep/CascLib/src/common/FileStream.cpp
index cb49f7f4ac1..7e0dd3cd484 100644
--- a/dep/CascLib/src/common/FileStream.cpp
+++ b/dep/CascLib/src/common/FileStream.cpp
@@ -134,6 +134,7 @@ static bool BaseFile_Open(TFileStream * pStream, const TCHAR * szFileName, DWORD
         if(fstat64(handle, &fileinfo) == -1)
         {
             SetLastError(errno);
+            close(handle);
             return false;
         }
 
@@ -192,7 +193,11 @@ static bool BaseFile_Read(
         // we have to update the file position
         if(ByteOffset != pStream->Base.File.FilePos)
         {
-            lseek64((intptr_t)pStream->Base.File.hFile, (off64_t)(ByteOffset), SEEK_SET);
+            if(lseek64((intptr_t)pStream->Base.File.hFile, (off64_t)(ByteOffset), SEEK_SET) == (off64_t)-1)
+            {
+                SetLastError(errno);
+                return false;
+            }
             pStream->Base.File.FilePos = ByteOffset;
         }
 
@@ -263,7 +268,11 @@ static bool BaseFile_Write(TFileStream * pStream, ULONGLONG * pByteOffset, const
         // we have to update the file position
         if(ByteOffset != pStream->Base.File.FilePos)
         {
-            lseek64((intptr_t)pStream->Base.File.hFile, (off64_t)(ByteOffset), SEEK_SET);
+            if(lseek64((intptr_t)pStream->Base.File.hFile, (off64_t)(ByteOffset), SEEK_SET) == (off64_t)-1)
+            {
+                SetLastError(errno);
+                return false;
+            }
             pStream->Base.File.FilePos = ByteOffset;
         }
 
diff --git a/dep/CascLib/src/common/ListFile.cpp b/dep/CascLib/src/common/ListFile.cpp
index 19d11b874b1..dc9a88bf44c 100644
--- a/dep/CascLib/src/common/ListFile.cpp
+++ b/dep/CascLib/src/common/ListFile.cpp
@@ -324,8 +324,11 @@ PLISTFILE_MAP ListFile_CreateMap(const TCHAR * szListFile)
                         break;
                 }
 
-                // Finish the listfile map
-                pListMap = ListMap_Finish(pListMap);
+                if(pListMap == NULL)
+                {
+                    // Finish the listfile map
+                    pListMap = ListMap_Finish(pListMap);
+                }
 
                 // Free the listfile
                 ListFile_Free(pvListFile);
diff --git a/dep/CascLib/src/common/Map.cpp b/dep/CascLib/src/common/Map.cpp
index 30ae8ea0531..aa1e2a2ada1 100644
--- a/dep/CascLib/src/common/Map.cpp
+++ b/dep/CascLib/src/common/Map.cpp
@@ -130,9 +130,11 @@ size_t Map_EnumObjects(PCASC_MAP pMap, void **ppvArray)
                 ppvArray[nIndex++] = pMap->HashTable[i];
             }
         }
+
+        return pMap->ItemCount;
     }
 
-    return pMap->ItemCount;
+    return 0;
 }
 
 void * Map_FindObject(PCASC_MAP pMap, void * pvKey, PDWORD PtrIndex)
-- 
cgit v1.2.3