aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/ssh/sshremoteprocess.cpp
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@qt.io>2017-05-05 09:55:01 +0200
committerChristian Kandeler <christian.kandeler@qt.io>2017-05-05 08:22:01 +0000
commit3691fbb8f8432fa084aadce8047317feef70cc16 (patch)
tree1a0e59a61515c8071363ccc18e51caa7141deaa1 /src/libs/ssh/sshremoteprocess.cpp
parent7e38b54525ac23c5cdbc18582e70d4a506b399d6 (diff)
SSH: Catch std::exception rather than Botan-specific ones
In particular, the existence of Botan::Exception wrongly suggests that it is the parent class of all Botan-specific exceptions. This assumption, combined with a different bug that will be fixed in a follow-up commit, caused a crash in the key generator. Change-Id: I0aafb761052d185051df217c9914010235a7c77b Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/libs/ssh/sshremoteprocess.cpp')
-rw-r--r--src/libs/ssh/sshremoteprocess.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/ssh/sshremoteprocess.cpp b/src/libs/ssh/sshremoteprocess.cpp
index 2f31b39fbc..5a875d1f10 100644
--- a/src/libs/ssh/sshremoteprocess.cpp
+++ b/src/libs/ssh/sshremoteprocess.cpp
@@ -209,7 +209,7 @@ void SshRemoteProcess::sendSignal(Signal signal)
QSSH_ASSERT_AND_RETURN(signalString);
d->m_sendFacility.sendChannelSignalPacket(d->remoteChannel(), signalString);
}
- } catch (const Botan::Exception &e) {
+ } catch (const std::exception &e) {
setErrorString(QString::fromLatin1(e.what()));
d->closeChannel();
}