pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix uninitialized data

Browse Source
This commit is contained in:
Oleg.Korshul
2020-10-26 16:32:27 +03:00
parent a0892f45dc
commit ea3d928f4d
2 changed files with 4 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

206
DesktopEditor/common/Array.h
View File

@ -35,10 +35,7 @@
#include "Types.h"
#include <string.h>
#ifdef INTERNAL_USE_ARRAY_AS_VECTOR
// Use std::vector instead this class
#include <vector>
template <class T>
@ -150,207 +147,4 @@ private:
std::vector<T> m_aT;
};
#else
#include <stdlib.h>
#if defined(_IOS) || defined(__ANDROID__)
#include <new>
#endif
template <class T>
class CArray
{
public:
// Construction/destruction
CArray() : m_aT(NULL), m_nSize(0), m_nAllocSize(0)
{ }
~CArray()
{
RemoveAll();
if (m_aT)
::free(m_aT);
}
CArray(const CArray<T>& src) : m_aT(NULL), m_nSize(0), m_nAllocSize(0)
{
int nSrcSize = src.GetCount();
if (0 != nSrcSize)
{
m_aT = (T*)::calloc(nSrcSize, sizeof(T));
if (m_aT != NULL)
{
m_nAllocSize = nSrcSize;
for (int i = 0; i < nSrcSize; i++)
::new(m_aT + i) T(src.m_aT[i]);
m_nSize = nSrcSize;
}
}
}
CArray<T>& operator=(const CArray<T>& src)
{
RemoveAll();
int nSrcSize = src.GetCount();
if (0 != nSrcSize)
{
m_aT = (T*)::calloc(nSrcSize, sizeof(T));
if (m_aT != NULL)
{
m_nAllocSize = nSrcSize;
for (int i = 0; i < nSrcSize; i++)
::new(m_aT + i) T(src.m_aT[i]);
m_nSize = nSrcSize;
}
}
return *this;
}
// Operations
int GetSize() const
{
return m_nSize;
}
int GetCount() const
{
return m_nSize;
}
INT SetCount(int nAllocSize)
{
RemoveAll();
if (nAllocSize != m_nAllocSize)
{
int nNewAllocSize = nAllocSize;
m_aT = (T*)::calloc(nNewAllocSize, sizeof(T));
for (int i = 0; i < nNewAllocSize; i++)
::new(m_aT + i) T;
if (NULL == m_aT)
return FALSE;
m_nAllocSize = nNewAllocSize;
m_nSize = nNewAllocSize;
}
return TRUE;
}
INT Add()
{
if (m_nSize == m_nAllocSize)
{
int nNewAllocSize = (m_nAllocSize == 0) ? 1 : (m_nSize * 2);
T* newT = (T*)::calloc(nNewAllocSize, sizeof(T));
//T* newT = (T*)malloc(nNewAllocSize * sizeof(T));
if (NULL == newT)
return FALSE;
m_nAllocSize = nNewAllocSize;
// без операторов копирования и деструкторов
MoveElements(newT, m_aT, m_nSize);
if (NULL != m_aT)
::free(m_aT);
m_aT = newT;
}
::new(m_aT + m_nSize) T;
m_nSize++;
return TRUE;
}
INT Add(const T& t)
{
if (FALSE == Add())
return FALSE;
m_aT[m_nSize - 1] = t;
return TRUE;
}
INT RemoveAt(int nIndex, int nCount = 1)
{
if (nIndex < 0 || nIndex >= m_nSize || nCount < 1)
return FALSE;
if ((nIndex + nCount) > m_nSize)
nCount = m_nSize - nIndex;
// вызываем деструкторы
for (int i = 0; i < nCount; ++i)
m_aT[nIndex + i].~T();
int nNewCount = nIndex + nCount;
int nMoveCount = m_nSize - nNewCount;
if (nNewCount != m_nSize)
{
MoveElements(m_aT + nIndex, m_aT + nNewCount, nMoveCount);
}
m_nSize -= nCount;
return TRUE;
}
void RemoveAll()
{
if (m_aT != NULL)
{
// вызываем деструкторы
for (int i = 0; i < m_nSize; i++)
m_aT[i].~T();
::free(m_aT);
m_aT = NULL;
}
m_nSize = 0;
m_nAllocSize = 0;
}
const T& operator[] (int nIndex) const
{
if (nIndex < 0 || nIndex >= m_nSize)
{
return m_aT[0]; // exeption
}
return m_aT[nIndex];
}
T& operator[] (int nIndex)
{
if (nIndex < 0 || nIndex >= m_nSize)
{
return m_aT[0]; // exeption
}
return m_aT[nIndex];
}
T* GetData() const
{
return m_aT;
}
private:
T* m_aT;
int m_nSize;
int m_nAllocSize;
private:
void MoveElements(T* dst, T* src, int nCount)
{
if (0 >= nCount)
return;
#ifdef WIN32
memmove_s((void*)dst, nCount * sizeof(T), (void*)src, nCount * sizeof(T));
#else
memmove((void*)dst, (void*)src, nCount * sizeof(T));
#endif
}
};
#endif
#endif // !defined(_GRAPHICS_ARRAY_H)

4
OfficeUtils/src/ZipUtilsCP.cpp
View File

@ -598,6 +598,10 @@ int oneZipFile(zipFile & zf, zip_fileinfo* zi, std::wstring & file_name, std::ws
zip_fileinfo zinfo;
zinfo.dosDate = zinfo.external_fa = zinfo.internal_fa = 0;
zinfo.tmz_date.tm_sec = zinfo.tmz_date.tm_min = zinfo.tmz_date.tm_hour = 0;
zinfo.tmz_date.tm_mday = 1;
zinfo.tmz_date.tm_mon = 0;
zinfo.tmz_date.tm_year = 1980;
zip_fileinfo* zi_new = zi ? zi : &zinfo;
if (bDateTime )