Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-11-09 23:19:24 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2019-12-01 20:00:10 +0300
commit0b49c74fe177fad620dfe3c358d9215e9dbe752f (patch)
tree9db02ef4258ef5cada85250ee8c42f21ab5371ed
parent4d932eb66b037acf63bef4ce9a975a6f28f0e99a (diff)
avcodec/g729dec: require buf_size to be non 0
The 0 case was added with the support for multiple packets. It appears unintended and causes extra complexity and out of array accesses (though within padding) No testcase Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit f64be9da4c8b16071ec84056a61d1fc0d5d6728c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/g729dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 32218e5989..908c12a73a 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -416,7 +416,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr,
return ret;
out_frame = (int16_t*) frame->data[0];
- if (buf_size % 10 == 0) {
+ if (buf_size && buf_size % 10 == 0) {
packet_type = FORMAT_G729_8K;
format = &format_g729_8k;
//Reset voice decision