valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Avoid division by zero when initializing pcspeaker

Browse source 
Coverity detects possible division by zero in calculation of spkr.min_tr
few lines below; this is a false-positive issue detected by Coverity,
but only bacause int value passed by user has a set of pre-determined
values.  We can as well make sure that value is never going to be
smaller than the minimum allowed.
This commit is contained in:
Patryk Obara 2020-03-01 03:38:11 +01:00 • committed by Patryk Obara
parent d47450c6d7
commit 19d1caa483
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/hardware/pcspeaker.cpp
View file

@ -16,15 +16,15 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <math.h>
#include "dosbox.h"
#include "mixer.h"
#include <algorithm>
#include <cmath>
#include "timer.h"
#include "setup.h"
#include "pic.h"
#ifndef PI
#define PI 3.14159265358979323846
#endif
@ -331,14 +331,14 @@ public:
spkr.mode=SPKR_OFF;
spkr.last_ticks=0;
spkr.last_index=0;
spkr.rate=section->Get_int("pcrate");
spkr.rate = std::max(section->Get_int("pcrate"), 8000);
spkr.pit_mode=3;
spkr.pit_max=(1000.0f/PIT_TICK_RATE)*1320;
spkr.pit_half=spkr.pit_max/2;
spkr.pit_new_max=spkr.pit_max;
spkr.pit_new_half=spkr.pit_half;
spkr.pit_index=0;
spkr.min_tr=(PIT_TICK_RATE+spkr.rate/2-1)/(spkr.rate/2);
spkr.min_tr = (PIT_TICK_RATE + spkr.rate/2 - 1) / (spkr.rate / 2);
spkr.used=0;
/* Register the sound channel */
spkr.chan=MixerChan.Install(&PCSPEAKER_CallBack,spkr.rate,"SPKR");