feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH: Don't call FileReader::fetch() with empty file name.

Browse Source 
Harmless, but triggers a warning in Qt.

Change-Id: I8d86a5bf28a66e47a680d9dd277c4c85b1a8f63f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-11-22 17:48:54 +01:00
parent 912f1f60c4
commit c43415e4ea
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/utils/ssh/sshconnection.cpp
View File

@@ -454,6 +454,8 @@ void SshConnectionPrivate::handleServiceAcceptPacket()
SshCapabilities::SshConnectionService, m_connParams.password.toUtf8()); SshCapabilities::SshConnectionService, m_connParams.password.toUtf8());
} else { } else {
Utils::FileReader reader; Utils::FileReader reader;
if (m_connParams.privateKeyFile.isEmpty())
throw SshClientException(SshKeyFileError, tr("No private key file given."));
if (!reader.fetch(m_connParams.privateKeyFile)) if (!reader.fetch(m_connParams.privateKeyFile))
throw SshClientException(SshKeyFileError, throw SshClientException(SshKeyFileError,
tr("Private key error: %1").arg(reader.errorString())); tr("Private key error: %1").arg(reader.errorString()));