This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/9.1 in repository ffmpeg.
commit 8f09647f23bc49e2a177ccfc90d7d2244f96a286 Author: Trevor Hansen <[email protected]> AuthorDate: Thu Nov 12 11:06:05 2026 +1100 Commit: Michael Niedermayer <[email protected]> CommitDate: Thu Nov 19 19:19:05 2026 +0100 avcodec/aac: do not return AVERROR_BUG for an unsupported LD/ELD sample rate index For ER AAC LD and ELD, decode_ics_info() reads the scalefactor-band tables with ff_aac_num_swb_480/512[sampling_index] (and the matching swb_offset tables). The decoder has no LD/ELD scalefactor-band table selected for sampling indices 0-2 and 8-12, and the function then returned AVERROR_BUG, which propagates out of avcodec_send_packet() and trips the av_assert0(ret != AVERROR_BUG) in the decode fuzzer. The sampling index comes from the stream configuration, so this is not an internal bug. Report this unsupported configuration through the existing failure path (AVERROR_INVALIDDATA, the default for this function) and log it. In practice only ELD reaches this: LD configurations with these indices are already rejected when the configuration is parsed. Only the single-channel path returned AVERROR_BUG, since decode_cpe() already maps any decode_ics_info() failure to AVERROR_INVALIDDATA. Signed-off-by: Trevor Hansen <[email protected]> (cherry picked from commit 02970f067cf06c5c23209d521575b1024898bb29) Signed-off-by: Michael Niedermayer <[email protected]> --- libavcodec/aac/aacdec.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/aac/aacdec.c b/libavcodec/aac/aacdec.c index d66c363b58..a69e26d85c 100644 --- a/libavcodec/aac/aacdec.c +++ b/libavcodec/aac/aacdec.c @@ -1507,7 +1507,9 @@ static int decode_ics_info(AACDecContext *ac, IndividualChannelStream *ics, ics->tns_max_bands = ff_tns_max_bands_512[sampling_index]; } if (!ics->num_swb || !ics->swb_offset) { - ret_fail = AVERROR_BUG; + av_log(ac->avctx, AV_LOG_ERROR, + "Unsupported sample rate index %d for LD/ELD\n", + sampling_index); goto fail; } } else { -- To stop receiving notification emails like this one, please contact [email protected]. _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
