kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-16 06:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res/res_rtp_asterisk.c: Fixing possible divide by zero" into 13

Browse Source
This commit is contained in:
Joshua C. Colp
2019-03-13 05:37:04 -05:00
committed by Gerrit Code Review
parent ce0d50541d 4bdf24a689
commit 48e64c5dc2
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
res/res_rtp_asterisk.c
View File

@@ -2755,6 +2755,14 @@ static double normdev_compute(double normdev, double sample, unsigned int sample
normdev = normdev * sample_count + sample; normdev = normdev * sample_count + sample;
sample_count++; sample_count++;
/*
It's possible the sample_count hits the maximum value and back to 0.
Set to 1 to prevent the divide by zero crash if the sample_count is 0.
*/
if (sample_count == 0) {
sample_count = 1;
}
return normdev / sample_count; return normdev / sample_count;
} }
@@ -2771,6 +2779,14 @@ static double stddev_compute(double stddev, double sample, double normdev, doubl
stddev = sample_count * stddev; stddev = sample_count * stddev;
sample_count++; sample_count++;
/*
It's possible the sample_count hits the maximum value and back to 0.
Set to 1 to prevent the divide by zero crash if the sample_count is 0.
*/
if (sample_count == 0) {
sample_count = 1;
}
return stddev + return stddev +
( sample_count * SQUARE( (sample - normdev) / sample_count ) ) + ( sample_count * SQUARE( (sample - normdev) / sample_count ) ) +
( SQUARE(sample - normdev_curent) / sample_count ); ( SQUARE(sample - normdev_curent) / sample_count );