summaryrefslogtreecommitdiff
authorzecke <zecke>2004-03-13 21:59:48 (UTC)
committer zecke <zecke>2004-03-13 21:59:48 (UTC)
commitee753c0009da5bec4a71d3263e9623d04dddc5c4 (patch) (side-by-side diff)
treef578536203c4277cc124d622b50f46a025cbb3f9
parent2eb5c075b612498c4b65f3d49389b8612612a930 (diff)
downloadopie-ee753c0009da5bec4a71d3263e9623d04dddc5c4.zip
opie-ee753c0009da5bec4a71d3263e9623d04dddc5c4.tar.gz
opie-ee753c0009da5bec4a71d3263e9623d04dddc5c4.tar.bz2
Fix possible divide by null
Patch for mickeyl...
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--libopie2/opienet/onetwork.cpp21
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
@@ -52,29 +52,29 @@
#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();
}
@@ -1001,17 +1001,18 @@ int OWirelessNetworkInterface::signalStrength() const
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 );
@@ -1238,11 +1239,11 @@ void OOrinocoMonitoringInterface::setEnabled( bool b )
}
}
QString OOrinocoMonitoringInterface::name() const
{
return "orinoco";
}
-
-}
-}
+
+}
+}