libopusdec: fix out-of-bounds read

[ffmpeg] / libavcodec / gsm_parser.c

diff --git a/libavcodec/gsm_parser.c b/libavcodec/gsm_parser.c
index 1d381fc10968318a06d72977cf7dfde446ec5c0d..c0befc779693fc671f72157f45f1ce9d1eab7e88 100644 (file)
--- a/libavcodec/gsm_parser.c
+++ b/libavcodec/gsm_parser.c
@@ -50,7 +50,8 @@ static int gsm_parse(AVCodecParserContext *s1, AVCodecContext *avctx,
             s->duration   = GSM_FRAME_SIZE;
             break;
         case AV_CODEC_ID_GSM_MS:
-            s->block_size = GSM_MS_BLOCK_SIZE;
+            s->block_size = avctx->block_align ? avctx->block_align
+                                               : GSM_MS_BLOCK_SIZE;
             s->duration   = GSM_FRAME_SIZE * 2;
             break;
         default: