Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix buffer overflow.
  • Loading branch information
g4klx committed Oct 7, 2020
1 parent 2d557ff commit cfc313e
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions Log.cpp
Expand Up @@ -65,15 +65,14 @@ static bool LogOpen()
::fclose(m_fpLog);
}

char filename[100U];
char filename[200U];
#if defined(_WIN32) || defined(_WIN64)
::sprintf(filename, "%s\\%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
#else
::sprintf(filename, "%s/%s-%04d-%02d-%02d.log", m_filePath.c_str(), m_fileRoot.c_str(), tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday);
#endif

if ((m_fpLog = ::fopen(filename, "a+t")) != NULL)
{
if ((m_fpLog = ::fopen(filename, "a+t")) != NULL) {
status = true;

#if !defined(_WIN32) && !defined(_WIN64)
Expand All @@ -95,6 +94,9 @@ bool LogInitialise(bool daemon, const std::string& filePath, const std::string&
m_displayLevel = displayLevel;
m_daemon = daemon;

if (m_daemon)
m_displayLevel = 0U;

return ::LogOpen();
}

Expand All @@ -108,7 +110,7 @@ void Log(unsigned int level, const char* fmt, ...)
{
assert(fmt != NULL);

char buffer[300U];
char buffer[501U];
#if defined(_WIN32) || defined(_WIN64)
SYSTEMTIME st;
::GetSystemTime(&st);
Expand All @@ -126,7 +128,7 @@ void Log(unsigned int level, const char* fmt, ...)
va_list vl;
va_start(vl, fmt);

::vsprintf(buffer + ::strlen(buffer), fmt, vl);
::vsnprintf(buffer + ::strlen(buffer), 500, fmt, vl);

va_end(vl);

Expand All @@ -149,4 +151,3 @@ void Log(unsigned int level, const char* fmt, ...)
exit(1);
}
}

0 comments on commit cfc313e

Please sign in to comment.