onkelbeh/fwbuilder
1
0
Fork 0
mirror of https://github.com/fwbuilder/fwbuilder synced 2026-09-16 18:14:40 +02:00
Code Issues Releases Wiki Activity

fixed #1347: ssh cancel rule install sigsegv SF bug 2973136

Browse Source
This commit is contained in:
Vadim Kurland
2010-03-19 22:46:53 +00:00
parent 6c5b8b3b32
commit 11d667ecf2
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_num
+1 -1
View File
@@ -1 +1 @@
#define BUILD_NUM 2740
#define BUILD_NUM 2741
doc/ChangeLog
+7
View File
@@ -1,5 +1,12 @@
2010-03-19 vadim <vadim@vk.crocodile.org>
* SSHCisco.cpp (SSHCisco::stateMachine): fixed SF bug 2973136,
fwbuilder bug #1347: ssh 'cancel' rule install sigsegv. Installer
caused GUI crash if user hit "Cancel" at just the right
moment. Apparently this also depends on the firewall platform
(was discovered and reported for Cisco FWSM) and perhaps on how
fast it responds to the installer commands.
* platform/fwsm.xml: fixed SourceForge bug 2973121: Added support
for FWSM v4.x
src/gui/SSHCisco.cpp
+6 -2
View File
@@ -384,7 +384,11 @@ void SSHCisco::stateMachine()
case PUSHING_CONFIG:
if ( cmpPrompt(stdoutBuffer, QRegExp(enable_prompt))) // config_prompt)) )
{
if ( activation_commands.size()!=0 )
// see SF bug 2973136 , fwbuilder bug #1347
// looks like if user hits Cancel to cancel install at just right
// moment, the process can get killed when control is already
// inside this block. Adding test for proc != NULL to be sure.
if ( activation_commands.size() != 0 && proc != NULL)
{
QString s;
@@ -417,7 +421,7 @@ void SSHCisco::stateMachine()
emit printStdout_sign( tr("End") + "\n" );
// kick it so we get some output from the router and
// continue the state machine
proc->write("\n");
if (proc) proc->write("\n");
}
}
break;