-Do not access the Array out of bounds

-Check that there is a driver before asking
 to query a non existant

2 files changed, 2 insertions, 1 deletions

diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
index e8137dd..1b61a2e 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp
@@ -116,64 +116,65 @@ OTDevice * OTGateway::getOTDevice( ) {
                  SIGNAL( error( const QString & ) ),
                  this, 
                  SLOT( SLOT_ShowError( const QString & ) ) );
       }
 
       return TheOTDevice;
 }
 
 // start bluetooth (if stopped)
 // return TRUE if started
 void OTGateway::SLOT_SetEnabled( bool Mode ) {
       if( Mode ) {
         SLOT_Enable();
         return;
       }
       SLOT_Disable();
 }
 
 void OTGateway::SLOT_Enable() {
       getOTDevice()->attach();
 }
 
 void OTGateway::SLOT_Disable() {
       getOTDevice()->detach();
 }
 
 bool OTGateway::needsEnabling() {
       return getOTDevice()->needsAttach();
 }
 
 bool OTGateway::isEnabled() {
       if( getOTDevice()->deviceNr() >= 0 &&
+          AllDrivers.count() != 0 &&
           driver( getOTDevice()->deviceNr() )->isUp() )
         return TRUE;
 
       // else check system
       return getOTDevice()->isAttached();
 }
 
 void OTGateway::SLOT_ShowError( const QString & S ) {
 
       odebug << S << oendl;
 
       if( ErrorConnectCount > 0 ) {
         // pass error
         emit error( QString( "<p>" ) + S + "</p>" );
         return;
       }
 
       QMessageBox::warning( 0,
           tr("OTGateway error"),
           S );
 }
 
 void OTGateway::connectNotify( const char * S ) {
       if( S && strcmp( S, "error(const QString&)" ) == 0 ) {
         ErrorConnectCount ++;
       }
 }
 
 void OTGateway::disconnectNotify( const char * S ) {
       if( S && strcmp( S, "error(const QString&)" ) == 0 ) {
         ErrorConnectCount --;
       }
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.h b/noncore/settings/networksettings2/opietooth2/OTGateway.h
index d97ef35..11c6b30 100644
--- a/noncore/settings/networksettings2/opietooth2/OTGateway.h
+++ b/noncore/settings/networksettings2/opietooth2/OTGateway.h
@@ -60,65 +60,65 @@ public :
 class OTGateway : public QObject {
 
       Q_OBJECT
 
 public :
 
       // single instance
       static OTGateway * getOTGateway( void );
       static void releaseOTGateway( void );
       // convert device type as class to name for that class
       static const char * deviceTypeToName( int Cls );
 
       // open bluetooth system
       OTGateway( void );
       // close bluetooth system
       ~OTGateway( void );
 
       // get access to system device
       OTDevice * getOTDevice();
 
       // return true if this device needs enabling of bluetooth
       bool needsEnabling();
       // return true if system is running
       bool isEnabled();
       void setRefreshTimer( int MilleSecs );
       // return socket to HCI raw layer
       inline int getSocket()
         { return HciCtl; }
 
       OTDriverList & getDriverList()
         { return AllDrivers; }
       OTDriver * driver( int nr ) 
-        { return AllDrivers[nr]; }
+        { return AllDrivers.count() == 0 ? 0 : AllDrivers[nr]; }
       void updateDrivers();
 
       PANConnectionVector getPANConnections();
 
       // scan neighbourhood using device
       void scanNeighbourhood( OTDriver * D = 0 );
       void stopScanOfNeighbourhood(void );
       void setScanWith( OTDriver * D = 0 ) 
         { ScanWith = (D) ? D : 
             (AllDrivers.count() ) ? AllDrivers[0] : 0; }
       OTDriver * scanWith( void )
         { return ScanWith; }
 
       // get list of all detected peers
       inline const PeerVector & peers( void )
         { return AllPeers; }
       // ping peer to see if it is up
       bool isPeerUp( const OTDeviceAddress & PAddr,
                      int timeoutInSec = 1,
                      int timeoutInUSec = 0,
                      int retry = 1 );
       OTPeer * findPeer( const OTDeviceAddress & Addr );
       void removePeer( OTPeer * P );
       void addPeer( OTPeer * P );
 
       OTDriver * findDriver( const OTDeviceAddress & Addr );
 
       inline const LinkKeyArray & getLinkKeys() const
         { return AllKeys; }
       bool removeLinkKey( unsigned int index );
 
       // return device number if we are connected over any device