Fix possible divide by null

Patch for mickeyl...

1 files changed, 11 insertions, 10 deletions

diff --git a/libopie2/opienet/onetwork.cpp b/libopie2/opienet/onetwork.cpp
index ab3e77f..26a6c81 100644
--- a/libopie2/opienet/onetwork.cpp
+++ b/libopie2/opienet/onetwork.cpp
@@ -28,77 +28,77 @@
 

 */

 

 /* OPIE */

 

 #include <opie2/onetwork.h>

 #include <opie2/ostation.h>

 #include <opie2/odebug.h>

 

 /* QT */

 

 #include <qfile.h>

 #include <qtextstream.h>

 

 /* UNIX */

 

 #include <assert.h>

 #include <arpa/inet.h>

 #include <errno.h>

 #include <string.h>

 #include <stdlib.h>

 #include <math.h>

 #include <sys/ioctl.h>

 #include <sys/socket.h>

 #include <sys/types.h>

 #include <unistd.h>

 #include <linux/sockios.h>

 #include <net/if_arp.h>

 #include <stdarg.h>

 

 #ifndef NODEBUG

 #include <opie2/odebugmapper.h>

-
-
-using namespace Opie::Core;
-using namespace Opie::Net::Private;
+

+

+using namespace Opie::Core;

+using namespace Opie::Net::Private;

 DebugMapper* debugmapper = new DebugMapper();

 #endif

 

 /*======================================================================================

  * ONetwork

  *======================================================================================*/

 

-namespace Opie {
-namespace Net  {
+namespace Opie {

+namespace Net  {

 ONetwork* ONetwork::_instance = 0;

 

 ONetwork::ONetwork()

 {

     odebug << "ONetwork::ONetwork()" << oendl;

     odebug << "ONetwork: This code has been compiled against Wireless Extensions V" << WIRELESS_EXT << oendl;

     synchronize();

 }

 

 void ONetwork::synchronize()

 {

     // gather available interfaces by inspecting /proc/net/dev

     //FIXME: we could use SIOCGIFCONF here, but we aren't interested in virtual (e.g. eth0:0) devices

     //FIXME: Use SIOCGIFCONF anway, because we can disable listing of aliased devices

     //FIXME: Best is use SIOCGIFCONF and if this doesn't work (result=-1), then fallback to parsing /proc/net/dev

 

     _interfaces.clear();

     QString str;

     QFile f( "/proc/net/dev" );

     bool hasFile = f.open( IO_ReadOnly );

     if ( !hasFile )

     {

         odebug << "ONetwork: /proc/net/dev not existing. No network devices available" << oendl;

         return;

     }

     QTextStream s( &f );

     s.readLine();

     s.readLine();

     while ( !s.atEnd() )

     {

         s >> str;

         str.truncate( str.find( ':' ) );

@@ -977,65 +977,66 @@ OStationList* OWirelessNetworkInterface::scanNetwork()
         }

         return stations;

 

         return stations;

 

     }

     else

     {

         odebug << " - no results (timeout) :(" << oendl;

         return stations;

     }

 }

 

 

 int OWirelessNetworkInterface::signalStrength() const

 {

     iw_statistics stat;

     ::memset( &stat, 0, sizeof stat );

     _iwr.u.data.pointer = (char*) &stat;

     _iwr.u.data.flags = 0;

     _iwr.u.data.length = sizeof stat;

 

     if ( !wioctl( SIOCGIWSTATS ) )

     {

         return -1;

     }

 

     int max = _range.max_qual.qual;

     int cur = stat.qual.qual;

     int lev = stat.qual.level; //FIXME: Do something with them?

     int noi = stat.qual.noise; //FIXME: Do something with them?

 

-    return cur*100/max;

+

+    return max != 0 ? cur*100/max: -1;

 }

 

 

 bool OWirelessNetworkInterface::wioctl( int call, struct iwreq& iwreq ) const

 {

     #ifndef NODEBUG

     int result = ::ioctl( _sfd, call, &iwreq );

 

     if ( result == -1 )

         odebug << "ONetworkInterface::wioctl (" << name() << ") call '"

                << debugmapper->map( call ) << "' FAILED! " << result << " (" << strerror( errno ) << ")" << oendl;

     else

         odebug << "ONetworkInterface::wioctl (" << name() << ") call '"

                << debugmapper->map( call ) << "' - Status: Ok." << oendl;

 

     return ( result != -1 );

     #else

     return ::ioctl( _sfd, call, &iwreq ) != -1;

     #endif

 }

 

 

 bool OWirelessNetworkInterface::wioctl( int call ) const

 {

     strcpy( _iwr.ifr_name, name() );

     return wioctl( call, _iwr );

 }

 

 

 /*======================================================================================

  * OMonitoringInterface

  *======================================================================================*/

@@ -1214,35 +1215,35 @@ OOrinocoMonitoringInterface::~OOrinocoMonitoringInterface()
 

 void OOrinocoMonitoringInterface::setChannel( int c )

 {

     if ( !_if->hasPrivate( "monitor" ) )

     {

         this->OMonitoringInterface::setChannel( c );

     }

     else

     {

         int monitorCode = _prismHeader ? 1 : 2;

         _if->setPrivate( "monitor", 2, monitorCode, c );

     }

 }

 

 

 void OOrinocoMonitoringInterface::setEnabled( bool b )

 {

     if ( b )

     {

         setChannel( 1 );

     }

     else

     {

         _if->setPrivate( "monitor", 2, 0, 0 );

     }

 }

 

 

 QString OOrinocoMonitoringInterface::name() const

 {

     return "orinoco";

 }

-
-}
-}
+

+}

+}