youngkingdom/s3fs-fuse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace snprintf with string and ostringstream (#1649)

Browse Source 
These uses are probably safe from a buffer overflow perspective but
can cause data race issues in logging due to static buffers.
This commit is contained in:
Andrew Gaul
2021-05-08 02:48:47 +09:00
committed by GitHub
parent 096a230b70
commit bb6d2b1b74
5 changed files with 33 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/s3fs_logger.cpp
View File

@ -19,6 +19,8 @@
*/
#include <cstdlib>
#include <iomanip>
#include <sstream>
#include <string>
#include "common.h"
@ -35,7 +37,6 @@ S3fsLog* S3fsLog::pSingleton = NULL;
S3fsLog::s3fs_log_level S3fsLog::debug_level = S3fsLog::LEVEL_CRIT;
FILE* S3fsLog::logfp = NULL;
std::string* S3fsLog::plogfile = NULL;
char S3fsLog::current_time[64] = "";
bool S3fsLog::time_stamp = true;
//-------------------------------------------------------------------
@ -46,6 +47,26 @@ bool S3fsLog::IsS3fsLogLevel(s3fs_log_level level)
return (level == (S3fsLog::debug_level & level));
}
std::string S3fsLog::GetCurrentTime()
{
std::ostringstream current_time;
if(time_stamp){
struct timeval now;
struct timespec tsnow;
struct tm res;
char tmp[32];
if(-1 == clock_gettime(S3FS_CLOCK_MONOTONIC, &tsnow)){
now.tv_sec = tsnow.tv_sec;
now.tv_usec = (tsnow.tv_nsec / 1000);
}else{
gettimeofday(&now, NULL);
}
strftime(tmp, sizeof(tmp), "%Y-%m-%dT%H:%M:%S", gmtime_r(&now.tv_sec, &res));
current_time << tmp << "." << std::setfill('0') << std::setw(3) << (now.tv_usec / 1000) << "Z ";
}
return current_time.str();
}
bool S3fsLog::SetLogfile(const char* pfile)
{
if(!S3fsLog::pSingleton){