PR #22345 opened by Lynne URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22345 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22345.patch
>From 01ec3884dfe440b98fd8aec9be5a036a43623d25 Mon Sep 17 00:00:00 2001 From: Lynne <[email protected]> Date: Mon, 2 Mar 2026 08:47:50 +0100 Subject: [PATCH 1/5] aacdec_usac_mps212: fix CID 1681705 Fixes Coverity issue #1681705 --- libavcodec/aac/aacdec_usac_mps212.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aac/aacdec_usac_mps212.c b/libavcodec/aac/aacdec_usac_mps212.c index 17f570c518..4f5ddb2c7b 100644 --- a/libavcodec/aac/aacdec_usac_mps212.c +++ b/libavcodec/aac/aacdec_usac_mps212.c @@ -70,6 +70,9 @@ static int huff_data_1d(GetBitContext *gb, int16_t *data, int data_bands, if (data_bands == 1) hcod1D = ff_aac_hcod1D_IPD[!diff_freq]; break; + default: + av_assert1(0); /* unreachable */ + break; } if (p0_flag) -- 2.52.0 >From 120a522e0c0109bd1afe75f0ddbdcd486a9824f1 Mon Sep 17 00:00:00 2001 From: Lynne <[email protected]> Date: Mon, 2 Mar 2026 08:49:06 +0100 Subject: [PATCH 2/5] aacdec_usac_mps212: Fix CID 1681704 Fixes Coverity issue #1681704 --- libavcodec/aac/aacdec_usac_mps212.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavcodec/aac/aacdec_usac_mps212.c b/libavcodec/aac/aacdec_usac_mps212.c index 4f5ddb2c7b..c41589c89a 100644 --- a/libavcodec/aac/aacdec_usac_mps212.c +++ b/libavcodec/aac/aacdec_usac_mps212.c @@ -213,6 +213,9 @@ static void huff_data_2d(GetBitContext *gb, int16_t *part0_data[2], int16_t (*da case 7: hcod2D = ff_aac_hcod2D_IPD_07[freq_pair][diff_freq]; break; } break; + default: + av_assert1(0); /* unreachable */ + break; } if (part0_data[0]) -- 2.52.0 >From df640f7be230f71a9b02e5b9ad9896ea3d398895 Mon Sep 17 00:00:00 2001 From: Lynne <[email protected]> Date: Mon, 2 Mar 2026 08:49:41 +0100 Subject: [PATCH 3/5] aacdec_usac_mps212: fix CID 1681703 Fixes Coverity issue #1681703 --- libavcodec/aac/aacdec_usac_mps212.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aac/aacdec_usac_mps212.c b/libavcodec/aac/aacdec_usac_mps212.c index c41589c89a..9cd3a58123 100644 --- a/libavcodec/aac/aacdec_usac_mps212.c +++ b/libavcodec/aac/aacdec_usac_mps212.c @@ -791,7 +791,7 @@ int ff_aac_map_index_data(AACMPSLosslessData *ld, if (nb_param_sets > MPS_MAX_PARAM_SETS) return AVERROR(EINVAL); - int data_mode_3_idx[MPS_MAX_PARAM_SETS]; + int data_mode_3_idx[MPS_MAX_PARAM_SETS] = { 0 }; int nb_data_mode_3 = 0; for (int i = 0; i < nb_param_sets; i++) { if (ld->data_mode[i] == 3) { -- 2.52.0 >From ebdbd5612698340d054f1e2744cc989a85663e90 Mon Sep 17 00:00:00 2001 From: Lynne <[email protected]> Date: Mon, 2 Mar 2026 08:50:40 +0100 Subject: [PATCH 4/5] aacdec_usac_mps212: Fix CID 1681701 Fixes Coverity issue #1681701 --- libavcodec/aac/aacdec_usac_mps212.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/aac/aacdec_usac_mps212.c b/libavcodec/aac/aacdec_usac_mps212.c index 9cd3a58123..13c717e522 100644 --- a/libavcodec/aac/aacdec_usac_mps212.c +++ b/libavcodec/aac/aacdec_usac_mps212.c @@ -804,7 +804,7 @@ int ff_aac_map_index_data(AACMPSLosslessData *ld, /* Prepare data */ int interpolate[MPS_MAX_PARAM_SETS] = { 0 }; - int16_t tmp_idx_data[MPS_MAX_PARAM_SETS][MPS_MAX_PARAM_BANDS]; + int16_t tmp_idx_data[MPS_MAX_PARAM_SETS][MPS_MAX_PARAM_BANDS] = { 0 }; for (int i = 0; i < nb_param_sets; i++) { if (ld->data_mode[i] == 0) { ld->coarse_quant_no[i] = 0; -- 2.52.0 >From 38317c243c91fed1ef3ffb09221b18b98d1f8924 Mon Sep 17 00:00:00 2001 From: Lynne <[email protected]> Date: Mon, 2 Mar 2026 08:51:14 +0100 Subject: [PATCH 5/5] aacdec_usac_mps212: fix CID 1681700 Fixes Coverity issue #1681700 --- libavcodec/aac/aacdec_usac_mps212.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavcodec/aac/aacdec_usac_mps212.c b/libavcodec/aac/aacdec_usac_mps212.c index 13c717e522..d6009f78a3 100644 --- a/libavcodec/aac/aacdec_usac_mps212.c +++ b/libavcodec/aac/aacdec_usac_mps212.c @@ -146,6 +146,8 @@ static void pcm_decode(GetBitContext *gb, int16_t *data0, int16_t *data1, return; }; + av_assert1(data0 || data1); + int pcm_chunk_size[7] = { 0 }; int tmp = 1; -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
