summaryrefslogtreecommitdiff
authorsandman <sandman>2002-10-31 03:11:34 (UTC)
committer sandman <sandman>2002-10-31 03:11:34 (UTC)
commitd4c2baf3d4998001462ac1be04523b216da02500 (patch) (side-by-side diff)
treed017a5598492e631988786fb50d45cfde34c9aec
parentd9d6cc6b3a537439affc8095dedd046c86f09d9e (diff)
downloadopie-d4c2baf3d4998001462ac1be04523b216da02500.zip
opie-d4c2baf3d4998001462ac1be04523b216da02500.tar.gz
opie-d4c2baf3d4998001462ac1be04523b216da02500.tar.bz2
added a sanity check to avoid a division by 0 in case the config file
contains bad data
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/launcher/screensaver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/core/launcher/screensaver.cpp b/core/launcher/screensaver.cpp
index 45da9ed..088ed19 100644
--- a/core/launcher/screensaver.cpp
+++ b/core/launcher/screensaver.cpp
@@ -187,8 +187,10 @@ void OpieScreenSaver::setBacklight ( int bright )
for ( uint i = 0; i < LS_Count; i++ ) {
if ( i < sl. count ( ))
m_sensordata [i] = sl [i]. toInt ( );
}
+ if ( m_sensordata [LS_Steps] < 2 ) // sanity check to avoid SIGFPE
+ m_sensordata [LS_Steps] = 2;
timerEvent ( 0 );
startTimer ( m_sensordata [LS_Interval] );
}
@@ -232,9 +234,9 @@ void OpieScreenSaver::timerEvent ( QTimerEvent * )
else {
int dx = m_sensordata [LS_SensorMax] - m_sensordata [LS_SensorMin];
int dy = m_sensordata [LS_LightMax] - m_sensordata [LS_LightMin];
- int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx;
+ int stepno = ( s - m_sensordata [LS_SensorMin] ) * m_sensordata [LS_Steps] / dx; // dx is never 0
m_backlight_sensor = m_sensordata [LS_LightMax] - dy * stepno / ( m_sensordata [LS_Steps] - 1 );
}
if ( !m_backlight_sensor )