[FFmpeg-devel] [PATCH] avformat/iamf_parse: Fix return of uninitialized value

James Almer jamrial at gmail.com
Sun Sep 1 19:27:17 EEST 2024


On 9/1/2024 12:12 PM, epirat07 at gmail.com wrote:
> 
> 
> On 31 Aug 2024, at 23:17, James Almer wrote:
> 
>> On 8/31/2024 5:45 PM, Marvin Scholz wrote:
>>> The ret value here is not yet intialized so the return would return
>>> uninitialized data. What was probably meant to be checked here was the
>>> return value of ffio_read_size, which can return an error.
>>>
>>> Introduced in 38bcb3ba7b3424abd772c72f8bdf445d75285e88
>>>
>>> Fixes: CID1618758
>>> ---
>>>    libavformat/iamf_parse.c | 4 ++--
>>>    1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c
>>> index f13e76b147..8a0003634b 100644
>>> --- a/libavformat/iamf_parse.c
>>> +++ b/libavformat/iamf_parse.c
>>> @@ -98,8 +98,8 @@ static int aac_decoder_config(IAMFCodecConfig *codec_config,
>>>            return AVERROR(ENOMEM);
>>>         codec_config->extradata_size = ffio_read_size(pb, codec_config->extradata, left);
>>> -    if (ret < 0)
>>> -        return ret;
>>> +    if (codec_config->extradata_size < 0)
>>> +        return codec_config->extradata_size;
>>>        memset(codec_config->extradata + codec_config->extradata_size, 0,
>>>               AV_INPUT_BUFFER_PADDING_SIZE);
>>
>> LGTM. Please backport to 7.0 too.
> 
> You (or someone else who can) will have to merge and backport as I have no commit access.
> Thanks.

Already did, thanks.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: OpenPGP_signature.asc
Type: application/pgp-signature
Size: 495 bytes
Desc: OpenPGP digital signature
URL: <https://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20240901/01a8fdde/attachment.sig>


More information about the ffmpeg-devel mailing list