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) (show whitespace changes)
-rw-r--r--noncore/settings/aqpkg/settingsimpl.cpp36
1 files changed, 33 insertions, 3 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
@@ -285,13 +285,23 @@ void SettingsImpl :: setupData()
void SettingsImpl :: editServer( int sel )
{
currentSelectedServer = sel;
Server *s = dataMgr->getServer( servers->currentText() );
+ 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;
@@ -304,11 +314,14 @@ void SettingsImpl :: newServer()
void SettingsImpl :: removeServer()
{
changed = true;
Server *s = dataMgr->getServer( servers->currentText() );
+ if ( s )
+ {
dataMgr->getServerList().removeRef( s );
servers->removeItem( currentSelectedServer );
}
+}
void SettingsImpl :: changeServerDetails()
{
changed = true;
@@ -331,14 +344,14 @@ void SettingsImpl :: changeServerDetails()
if ( !newserver )
{
Server *s = dataMgr->getServer( servers->currentText() );
-
+ if ( s )
+ {
// 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
@@ -347,8 +360,9 @@ void SettingsImpl :: changeServerDetails()
// Update list box
servers->changeItem( newName, currentSelectedServer );
}
+ }
else
{
Server s( newName, serverurl->text() );
dataMgr->getServerList().append( new Server( newName, serverurl->text() ) );
@@ -364,13 +378,23 @@ void SettingsImpl :: changeServerDetails()
void SettingsImpl :: editDestination( int sel )
{
currentSelectedDestination = sel;
Destination *d = dataMgr->getDestination( destinations->currentText() );
+ 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;
@@ -383,11 +407,14 @@ void SettingsImpl :: newDestination()
void SettingsImpl :: removeDestination()
{
changed = true;
Destination *d = dataMgr->getDestination( destinations->currentText() );
+ if ( d )
+ {
dataMgr->getDestinationList().removeRef( d );
destinations->removeItem( currentSelectedDestination );
}
+}
void SettingsImpl :: changeDestinationDetails()
{
changed = true;
@@ -400,9 +427,10 @@ void SettingsImpl :: changeDestinationDetails()
QString newName = destinationname->text();
if ( !newdestination )
{
Destination *d = dataMgr->getDestination( destinations->currentText() );
-
+ if ( d )
+ {
// Update url
d->setDestinationPath( destinationurl->text() );
d->linkToRoot( linkToRoot->isChecked() );
@@ -414,15 +442,17 @@ void SettingsImpl :: changeDestinationDetails()
// Update list box
destinations->changeItem( newName, currentSelectedDestination );
}
+
#ifdef QWS
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 );