summaryrefslogtreecommitdiff
authordrw <drw>2003-03-15 16:09:22 (UTC)
committer drw <drw>2003-03-15 16:09:22 (UTC)
commit69823b154b29cd62c9d53f7ebdaae4cb7dd61939 (patch) (side-by-side diff)
treef678ad4bb0cf7005ce00e7231713372220c75cf6
parentede78d4ab60d2c78427c4b1cc51cd9accc0aed1c (diff)
downloadopie-69823b154b29cd62c9d53f7ebdaae4cb7dd61939.zip
opie-69823b154b29cd62c9d53f7ebdaae4cb7dd61939.tar.gz
opie-69823b154b29cd62c9d53f7ebdaae4cb7dd61939.tar.bz2
Added several checks to ensure we have a valid server or destination. Fixes bug #727, and also prevents several other segfault situations.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/aqpkg/settingsimpl.cpp114
1 files changed, 72 insertions, 42 deletions
diff --git a/noncore/settings/aqpkg/settingsimpl.cpp b/noncore/settings/aqpkg/settingsimpl.cpp
index 9f611da..e2afada 100644
--- a/noncore/settings/aqpkg/settingsimpl.cpp
+++ b/noncore/settings/aqpkg/settingsimpl.cpp
@@ -281,37 +281,50 @@ void SettingsImpl :: setupData()
}
//------------------ Servers tab ----------------------
void SettingsImpl :: editServer( int sel )
{
currentSelectedServer = sel;
Server *s = dataMgr->getServer( servers->currentText() );
- serverName = s->getServerName();
- servername->setText( s->getServerName() );
- serverurl->setText( s->getServerUrl() );
- active->setChecked( s->isServerActive() );
+ if ( s )
+ {
+ serverName = s->getServerName();
+ servername->setText( s->getServerName() );
+ serverurl->setText( s->getServerUrl() );
+ active->setChecked( s->isServerActive() );
+ }
+ else
+ {
+ serverName = "";
+ servername->setText( "" );
+ serverurl->setText( "" );
+ active->setChecked( false );
+ }
}
void SettingsImpl :: newServer()
{
newserver = true;
servername->setText( "" );
serverurl->setText( "" );
servername->setFocus();
active->setChecked( true );
}
void SettingsImpl :: removeServer()
{
changed = true;
Server *s = dataMgr->getServer( servers->currentText() );
- dataMgr->getServerList().removeRef( s );
- servers->removeItem( currentSelectedServer );
+ if ( s )
+ {
+ dataMgr->getServerList().removeRef( s );
+ servers->removeItem( currentSelectedServer );
+ }
}
void SettingsImpl :: changeServerDetails()
{
changed = true;
QString newName = servername->text();
@@ -327,105 +340,122 @@ void SettingsImpl :: changeServerDetails()
tmpStr[newName.length()] = '\0';
newName = tmpStr;
delete tmpStr;
if ( !newserver )
{
Server *s = dataMgr->getServer( servers->currentText() );
-
- // Update url
- s->setServerUrl( serverurl->text() );
- s->setActive( active->isChecked() );
-
-
- // Check if server name has changed, if it has then we need to replace the key in the map
- if ( serverName != newName )
+ if ( s )
{
- // Update server name
- s->setServerName( newName );
- }
+ // Update url
+ s->setServerUrl( serverurl->text() );
+ s->setActive( active->isChecked() );
+
+ // Check if server name has changed, if it has then we need to replace the key in the map
+ if ( serverName != newName )
+ {
+ // Update server name
+ s->setServerName( newName );
+ }
- // Update list box
- servers->changeItem( newName, currentSelectedServer );
+ // Update list box
+ servers->changeItem( newName, currentSelectedServer );
+ }
}
else
{
Server s( newName, serverurl->text() );
dataMgr->getServerList().append( new Server( newName, serverurl->text() ) );
dataMgr->getServerList().last()->setActive( active->isChecked() );
servers->insertItem( newName );
servers->setCurrentItem( servers->count() );
newserver = false;
}
}
//------------------ Destinations tab ----------------------
void SettingsImpl :: editDestination( int sel )
{
- currentSelectedDestination = sel;
+ currentSelectedDestination = sel;
Destination *d = dataMgr->getDestination( destinations->currentText() );
- destinationName = d->getDestinationName();
- destinationname->setText( d->getDestinationName() );
- destinationurl->setText( d->getDestinationPath() );
- linkToRoot->setChecked( d->linkToRoot() );
+ if ( d )
+ {
+ destinationName = d->getDestinationName();
+ destinationname->setText( d->getDestinationName() );
+ destinationurl->setText( d->getDestinationPath() );
+ linkToRoot->setChecked( d->linkToRoot() );
+ }
+ else
+ {
+ destinationName = "";
+ destinationname->setText( "" );
+ destinationurl->setText( "" );
+ linkToRoot->setChecked( false );
+ }
}
void SettingsImpl :: newDestination()
{
newdestination = true;
destinationname->setText( "" );
destinationurl->setText( "" );
destinationname->setFocus();
linkToRoot->setChecked( true );
}
void SettingsImpl :: removeDestination()
{
changed = true;
Destination *d = dataMgr->getDestination( destinations->currentText() );
- dataMgr->getDestinationList().removeRef( d );
- destinations->removeItem( currentSelectedDestination );
+ if ( d )
+ {
+ dataMgr->getDestinationList().removeRef( d );
+ destinations->removeItem( currentSelectedDestination );
+ }
}
void SettingsImpl :: changeDestinationDetails()
{
changed = true;
#ifdef QWS
Config cfg( "aqpkg" );
cfg.setGroup( "destinations" );
#endif
QString newName = destinationname->text();
if ( !newdestination )
{
Destination *d = dataMgr->getDestination( destinations->currentText() );
+ if ( d )
+ {
+ // Update url
+ d->setDestinationPath( destinationurl->text() );
+ d->linkToRoot( linkToRoot->isChecked() );
- // Update url
- d->setDestinationPath( destinationurl->text() );
- d->linkToRoot( linkToRoot->isChecked() );
+ // Check if server name has changed, if it has then we need to replace the key in the map
+ if ( destinationName != newName )
+ {
+ // Update server name
+ d->setDestinationName( newName );
- // Check if server name has changed, if it has then we need to replace the key in the map
- if ( destinationName != newName )
- {
- // Update server name
- d->setDestinationName( newName );
+ // Update list box
+ destinations->changeItem( newName, currentSelectedDestination );
+ }
- // Update list box
- destinations->changeItem( newName, currentSelectedDestination );
- }
#ifdef QWS
- QString key = newName;
- key += "_linkToRoot";
- int val = d->linkToRoot();
- cfg.writeEntry( key, val );
-#endif
+ QString key = newName;
+ key += "_linkToRoot";
+ int val = d->linkToRoot();
+ cfg.writeEntry( key, val );
+#endif
+ }
}
else
{
dataMgr->getDestinationList().append( new Destination( newName, destinationurl->text() ) );
destinations->insertItem( newName );
destinations->setCurrentItem( destinations->count() );
newdestination = false;