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

SSH: Ignore incoming data after requesting to close an SFTP channel.

Browse Source
This commit is contained in:
Christian Kandeler
2010-11-03 16:41:32 +01:00
parent ea59569640
commit 706a04c686
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/coreplugin/ssh/sftpchannel.cpp
View File

@@ -214,6 +214,8 @@ SftpJobId SftpChannelPrivate::createJob(const AbstractSftpOperation::Ptr &job)
void SftpChannelPrivate::handleChannelSuccess() void SftpChannelPrivate::handleChannelSuccess()
{ {
if (channelState() == CloseRequested)
return;
#ifdef CREATOR_SSH_DEBUG #ifdef CREATOR_SSH_DEBUG
qDebug("sftp subsystem initialized"); qDebug("sftp subsystem initialized");
#endif #endif
@@ -223,6 +225,9 @@ void SftpChannelPrivate::handleChannelSuccess()
void SftpChannelPrivate::handleChannelFailure() void SftpChannelPrivate::handleChannelFailure()
{ {
if (channelState() == CloseRequested)
return;
if (m_sftpState != SubsystemRequested) { if (m_sftpState != SubsystemRequested) {
throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR, throw SSH_SERVER_EXCEPTION(SSH_DISCONNECT_PROTOCOL_ERROR,
"Unexpected SSH_MSG_CHANNEL_FAILURE packet."); "Unexpected SSH_MSG_CHANNEL_FAILURE packet.");
@@ -233,6 +238,9 @@ void SftpChannelPrivate::handleChannelFailure()
void SftpChannelPrivate::handleChannelDataInternal(const QByteArray &data) void SftpChannelPrivate::handleChannelDataInternal(const QByteArray &data)
{ {
if (channelState() == CloseRequested)
return;
m_incomingData += data; m_incomingData += data;
m_incomingPacket.consumeData(m_incomingData); m_incomingPacket.consumeData(m_incomingData);
while (m_incomingPacket.isComplete()) { while (m_incomingPacket.isComplete()) {
@@ -764,6 +772,9 @@ SftpChannelPrivate::JobMap::Iterator SftpChannelPrivate::lookupJob(SftpJobId id)
void SftpChannelPrivate::closeHook() void SftpChannelPrivate::closeHook()
{ {
m_jobs.clear();
m_incomingData.clear();
m_incomingPacket.clear();
emit closed(); emit closed();
} }