From 66b50445cb36cf6adb49c2397362509aedb42c71 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Fri, 16 Feb 2024 11:17:13 -0300
Subject: [PATCH 1/3] avcodec/speexdec: check for sane frame_size values

Regression since ab39cc36c72bb73318bb911acb66873de850a107.

Fixes heap buffer overflows
Fixes ticket #10866

Reported-by: sploitem <sploitem@gmail.com>
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>

CVE: CVE-2024-28661

Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/66b50445cb36cf6adb49c2397362509aedb42c71]

Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
---
 libavcodec/speexdec.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
index 08c7e77..23b8605 100644
--- a/libavcodec/speexdec.c
+++ b/libavcodec/speexdec.c
@@ -1422,6 +1422,7 @@ static int parse_speex_extradata(AVCodecContext *avctx,
     s->frame_size = bytestream_get_le32(&buf);
     if (s->frame_size < NB_FRAME_SIZE << s->mode)
         return AVERROR_INVALIDDATA;
+    s->frame_size *= 1 + (s->mode > 0);
     s->vbr = bytestream_get_le32(&buf);
     s->frames_per_packet = bytestream_get_le32(&buf);
     if (s->frames_per_packet <= 0 ||
--
2.40.0
