StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Fix IPC::~IPC use after free of static log file

Browse Source
This commit is contained in:
tux3 2015-10-23 19:21:37 +02:00
parent 4d9aeeec39
commit 2d7c65efbb
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main.cpp
View File

@ -43,7 +43,8 @@
#endif
#ifdef LOG_TO_FILE
static QTextStream* logFile {nullptr};
static std::unique_ptr<QTextStream> logFileStream {nullptr};
static std::unique_ptr<QFile> logFileFile {nullptr};
static QMutex mutex;
#endif
@ -80,12 +81,12 @@ void logMessageHandler(QtMsgType type, const QMessageLogContext& ctxt, const QSt
out << LogMsg;
#ifdef LOG_TO_FILE
if (!logFile)
if (!logFileStream)
return;
QMutexLocker locker(&mutex);
*logFile << LogMsg;
logFile->flush();
*logFileStream << LogMsg;
logFileStream->flush();
#endif
}
@ -121,18 +122,17 @@ int main(int argc, char *argv[])
sodium_init(); // For the auto-updater
#ifdef LOG_TO_FILE
logFile = new QTextStream;
QFile logfile(Settings::getInstance().getSettingsDirPath()+"qtox.log");
if (logfile.open(QIODevice::Append))
logFileStream.reset(new QTextStream);
logFileFile.reset(new QFile(Settings::getInstance().getSettingsDirPath()+"qtox.log"));
if (logFileFile->open(QIODevice::Append))
{
logFile->setDevice(&logfile);
*logFile << QDateTime::currentDateTime().toString("\nyyyy-MM-dd HH:mm:ss' file logger starting\n'");
logFileStream->setDevice(logFileFile.get());
*logFileStream << QDateTime::currentDateTime().toString("\nyyyy-MM-dd HH:mm:ss' file logger starting\n'");
}
else
{
qWarning() << "Couldn't open log file!\n";
delete logFile;
logFile = nullptr;
logFileStream.release();
}
#endif
@ -260,8 +260,7 @@ int main(int argc, char *argv[])
int errorcode = a.exec();
#ifdef LOG_TO_FILE
delete logFile;
logFile = nullptr;
logFileStream.release();
#endif
Nexus::destroyInstance();