Re: [FFmpeg-devel] [PATCH] avcodec/amrwbdec: Fix division by 0 in voice_factor()

2017-12-10 Thread Michael Niedermayer
On Thu, Dec 07, 2017 at 05:39:41PM +0100, Michael Niedermayer wrote:
> The added value matches "Digital cellular telecommunications system (Phase 
> 2+) (GSM); Universal Mobile Telecommunications System (UMTS); LTE; Extended 
> Adaptive Multi-Rate - Wideband (AMR-WB+) codec; Floating-point ANSI-C code 
> (3GPP TS 26.304 version 14.0.0 Release 14)
> Extended Adaptive Multi-Rate - Wideband (AMR-WB+) codec; Floating-point 
> ANSI-C code"
> 
> Fixes: runtime error: division by zero
> Fixes: 4415/clusterfuzz-testcase-minimized-4677752314658816

applied

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The bravest are surely those who have the clearest vision
of what is before them, glory and danger alike, and yet
notwithstanding go out to meet it. -- Thucydides


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel


[FFmpeg-devel] [PATCH] avcodec/amrwbdec: Fix division by 0 in voice_factor()

2017-12-07 Thread Michael Niedermayer
The added value matches "Digital cellular telecommunications system (Phase 2+) 
(GSM); Universal Mobile Telecommunications System (UMTS); LTE; Extended 
Adaptive Multi-Rate - Wideband (AMR-WB+) codec; Floating-point ANSI-C code 
(3GPP TS 26.304 version 14.0.0 Release 14)
Extended Adaptive Multi-Rate - Wideband (AMR-WB+) codec; Floating-point ANSI-C 
code"

Fixes: runtime error: division by zero
Fixes: 4415/clusterfuzz-testcase-minimized-4677752314658816

Found-by: continuous fuzzing process 
https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer 
---
 libavcodec/amrwbdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c
index 57aed874cc..7f2874d35f 100644
--- a/libavcodec/amrwbdec.c
+++ b/libavcodec/amrwbdec.c
@@ -611,7 +611,7 @@ static float voice_factor(float *p_vector, float p_gain,
   AMRWB_SFR_SIZE) *
 f_gain * f_gain;
 
-return (p_ener - f_ener) / (p_ener + f_ener);
+return (p_ener - f_ener) / (p_ener + f_ener + 0.01);
 }
 
 /**
-- 
2.15.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel