+ Fixed defects found by Coverity (well, most of them)

This commit is contained in:
Ladislav Zezula
2015-05-28 13:49:23 +02:00
parent c26e12c79f
commit 1b38ceb0d4
20 changed files with 232 additions and 135 deletions

View File

@@ -92,6 +92,57 @@ unsigned char AsciiToUpperTable_Slash[256] =
0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
};
//-----------------------------------------------------------------------------
// Safe string functions
void StringCopyA(char * dest, const char * src, size_t nMaxChars)
{
size_t nLength = strlen(src);
// Don't copy more than nMaxChars
nLength = STORMLIB_MIN(nLength, nMaxChars);
memcpy(dest, src, nLength);
dest[nLength] = 0;
}
void StringCatA(char * dest, const char * src, size_t nMaxChars)
{
size_t nLength1 = strlen(dest);
size_t nLength2 = strlen(src);
// Don't copy more than nMaxChars
if(nLength1 < nMaxChars)
{
nLength2 = STORMLIB_MIN(nLength2, (nMaxChars - nLength1));
memcpy(dest + nLength1, src, nLength2);
dest[nLength1 + nLength2] = 0;
}
}
void StringCopyT(TCHAR * dest, const TCHAR * src, size_t nMaxChars)
{
size_t nLength = _tcslen(src);
// Don't copy more than nMaxChars
nLength = STORMLIB_MIN(nLength, nMaxChars);
memcpy(dest, src, (nLength * sizeof(TCHAR)));
dest[nLength] = 0;
}
void StringCatT(TCHAR * dest, const TCHAR * src, size_t nMaxChars)
{
size_t nLength1 = _tcslen(dest);
size_t nLength2 = _tcslen(src);
// Don't copy more than nMaxChars
if(nLength1 < nMaxChars)
{
nLength2 = STORMLIB_MIN(nLength2, (nMaxChars - nLength1));
memcpy(dest + nLength1, src, (nLength2 * sizeof(TCHAR)));
dest[nLength1 + nLength2] = 0;
}
}
//-----------------------------------------------------------------------------
// Storm hashing functions