Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-06-20 12:44:47 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix freeze and high CPU usage on invalid STDIN data, resolves #1620

Browse source
This commit is contained in:
Janek Bevendorff 2018-03-04 23:56:06 +01:00
parent 386b78b896
commit 63a17f697c
3 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/browser/NativeMessagingHost.cpp
View file

@ -107,20 +107,28 @@ void NativeMessagingHost::readLength()
void NativeMessagingHost::readStdIn(const quint32 length)
{
if (length > 0) {
if (length <= 0) {
return;
}
QByteArray arr;
arr.reserve(length);
QMutexLocker locker(&m_mutex);
for (quint32 i = 0; i < length; ++i) {
arr.append(getchar());
int c = std::getchar();
if (c == EOF) {
// message ended prematurely, ignore it and return
return;
}
arr.append(static_cast<char>(c));
}
if (arr.length() > 0) {
QMutexLocker locker(&m_mutex);
sendReply(m_browserClients.readResponse(arr));
}
}
}
void NativeMessagingHost::newLocalConnection()
{

5
src/main.cpp
View file

@ -143,12 +143,15 @@ int main(int argc, char** argv)
const bool pwstdin = parser.isSet(pwstdinOption);
for (const QString& filename: fileNames) {
if (!filename.isEmpty() && QFile::exists(filename) && !filename.endsWith(".json", Qt::CaseInsensitive)) {
QString password;
if (pwstdin) {
// we always need consume a line of STDIN if --pw-stdin is set to clear out the
// buffer for native messaging, even if the specified file does not exist
static QTextStream in(stdin, QIODevice::ReadOnly);
password = in.readLine();
}
if (!filename.isEmpty() && QFile::exists(filename) && !filename.endsWith(".json", Qt::CaseInsensitive)) {
mainWindow.openDatabase(filename, password, parser.value(keyfileOption));
}
}

13
src/proxy/NativeMessagingHost.cpp
View file

@ -51,12 +51,20 @@ void NativeMessagingHost::readLength()
void NativeMessagingHost::readStdIn(const quint32 length)
{
if (length > 0) {
if (length <= 0) {
return;
}
QByteArray arr;
arr.reserve(length);
for (quint32 i = 0; i < length; ++i) {
arr.append(getchar());
int c = std::getchar();
if (c == EOF) {
// message ended prematurely, ignore it and return
return;
}
arr.append(static_cast<char>(c));
}
if (arr.length() > 0 && m_localSocket && m_localSocket->state() == QLocalSocket::ConnectedState) {
@ -64,7 +72,6 @@ void NativeMessagingHost::readStdIn(const quint32 length)
m_localSocket->flush();
}
}
}
void NativeMessagingHost::newLocalMessage()
{