[FFmpeg-devel] [PATCH] avcodec/speexdec: consider differing frame sizes in remaining space check

[FFmpeg-devel] [PATCH] avcodec/speexdec: consider differing frame sizes in remaining space check

[Michael Niedermayer]

Fixes: talk109-q5.spx
Regression since: f6986e75be87f512f65d64ac91ba19d505a8d210

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/speexdec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
index 94dce5420cc..ba9faeb15d1 100644
--- a/libavcodec/speexdec.c
+++ b/libavcodec/speexdec.c
@@ -1234,7 +1234,7 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st,
     mode = st->mode;
 
     if (st->modeID > 0) {
-        if (packets_left <= 1)
+        if (packets_left * s->frame_size < 2*st->frame_size)
             return AVERROR_INVALIDDATA;
         low_innov_alias = out + st->frame_size;
         s->st[st->modeID - 1].innov_save = low_innov_alias;
-- 
2.49.0

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/speexdec: consider differing frame sizes in remaining space check

[James Almer]

[-- Attachment #1.1.1: Type: text/plain, Size: 913 bytes --]

On 6/27/2025 1:14 PM, Michael Niedermayer wrote:
> Fixes: talk109-q5.spx

Can this file be added to FATE?

> Regression since: f6986e75be87f512f65d64ac91ba19d505a8d210
> 
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>   libavcodec/speexdec.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c
> index 94dce5420cc..ba9faeb15d1 100644
> --- a/libavcodec/speexdec.c
> +++ b/libavcodec/speexdec.c
> @@ -1234,7 +1234,7 @@ static int sb_decode(AVCodecContext *avctx, void *ptr_st,
>       mode = st->mode;
>   
>       if (st->modeID > 0) {
> -        if (packets_left <= 1)
> +        if (packets_left * s->frame_size < 2*st->frame_size)
>               return AVERROR_INVALIDDATA;
>           low_innov_alias = out + st->frame_size;
>           s->st[st->modeID - 1].innov_save = low_innov_alias;


[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 495 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH] avcodec/speexdec: consider differing frame sizes in remaining space check

[Michael Niedermayer]

[-- Attachment #1.1: Type: text/plain, Size: 485 bytes --]

On Fri, Jun 27, 2025 at 03:18:33PM -0300, James Almer wrote:
> On 6/27/2025 1:14 PM, Michael Niedermayer wrote:
> > Fixes: talk109-q5.spx
> 
> Can this file be added to FATE?

its there: https://samples.ffmpeg.org/A-codecs/speex/talk109-q5.spx
whoever adds the test would need to cut it first as its 5mb

thx

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Democracy is the form of government in which you can choose your dictator

[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 195 bytes --]

[-- Attachment #2: Type: text/plain, Size: 251 bytes --]

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".